Merge lp:~hrvojem/percona-xtrabackup/rn-2.3.0-alpha1-2.2 into lp:percona-xtrabackup/2.3

[Alexey Kopytov]

[Alexey Kopytov (akopytov)]

Hrvoje,

Please rebase this on the current PXB trunk (which is now based on 2.3) and resubmit to exclude unrelated revisions.

review: Needs Resubmitting

Unmerged revisions

5042. By Hrvoje Matijakovic on 2014-10-29

-xbcloud documentation, 2.3.0-alpha1 release notes

=== modified file 'storage/innobase/xtrabackup/doc/source/conf.py'
--- storage/innobase/xtrabackup/doc/source/conf.py	2014-09-30 09:43:35 +0000
+++ storage/innobase/xtrabackup/doc/source/conf.py	2014-11-05 11:10:08 +0000
@@ -122,6 +122,8 @@
 
 .. |MariaDB|  replace:: *MariaDB*
 
+.. |xbcloud|  replace:: *xbcloud*
+
 .. |tar4ibd|  replace:: :program:`tar4ibd`
 
 .. |tar|  replace:: :program:`tar`
 
=== modified file 'storage/innobase/xtrabackup/doc/source/installation/apt_repo.rst'
--- storage/innobase/xtrabackup/doc/source/installation/apt_repo.rst	2014-09-25 16:10:20 +0000
+++ storage/innobase/xtrabackup/doc/source/installation/apt_repo.rst	2014-11-05 11:10:08 +0000
@@ -37,10 +37,10 @@
 
  * 10.04LTS (lucid)
  * 12.04LTS (precise) 
- * 13.10 (saucy)
  * 14.04LTS (trusty)
+ * 14.10 (utopic)
 
-.. _debian_experimental: 
+.. _debian_testing: 
 
 Percona `apt` Testing repository
 =================================
 
=== modified file 'storage/innobase/xtrabackup/doc/source/manual.rst'
--- storage/innobase/xtrabackup/doc/source/manual.rst	2013-08-30 09:55:04 +0000
+++ storage/innobase/xtrabackup/doc/source/manual.rst	2014-11-05 11:10:08 +0000
@@ -12,6 +12,7 @@
    xtrabackup_bin/xtrabackup_binary
    xbstream/xbstream
    xbcrypt/xbcrypt
+   xbcloud/xbcloud
    how_xtrabackup_works
 
 |Percona XtraBackup| is a set of following tools:
@@ -28,4 +29,7 @@
 :doc:`xbstream <xbstream/xbstream>`
    utility that allows streaming and extracting files to/from the :term:`xbstream` format.
 
+:doc:`xbcloud <xbcloud/xbcloud>`
+   utility used for downloading and uploading full or part of |xbstream| archive from/to cloud.
+   
 It is possible to use the |xtrabackup| binary alone, however, the recommend way is using it through the |innobackupex| wrapper script and let it execute |xtrabackup| for you. It might be helpful to first learn :doc:`how to use innobackupex <innobackupex/innobackupex_script>`, and then learn  :doc:`how to use xtrabackup <xtrabackup_bin/xtrabackup_binary>` for having a better low-level understanding or control of the tool if needed.
 
=== modified file 'storage/innobase/xtrabackup/doc/source/release-notes.rst'
--- storage/innobase/xtrabackup/doc/source/release-notes.rst	2014-03-26 07:39:36 +0000
+++ storage/innobase/xtrabackup/doc/source/release-notes.rst	2014-11-05 11:10:08 +0000
@@ -48,3 +48,14 @@
    :glob:
 
    release-notes/2.2/*
+
+Percona |XtraBackup| 2.3 
+=========================
+
+.. toctree::
+   :maxdepth: 1
+   :glob:
+
+   release-notes/2.3/*
+
+
 
=== modified file 'storage/innobase/xtrabackup/doc/source/release-notes/2.2/2.2.1-alpha1.rst'
--- storage/innobase/xtrabackup/doc/source/release-notes/2.2/2.2.1-alpha1.rst	2014-03-28 11:46:09 +0000
+++ storage/innobase/xtrabackup/doc/source/release-notes/2.2/2.2.1-alpha1.rst	2014-11-05 11:10:08 +0000
@@ -2,7 +2,7 @@
  |Percona XtraBackup| 2.2.1-alpha1
 =======================================
 
-Percona is glad to announce the release of |Percona XtraBackup| 2.2.1-alpha1 on March 28th 2014. Downloads are available from our download site `here <http://www.percona.com/downloads/XtraBackup/2.2.1/>`_. This **ALPHA** release, will be available in :ref:`Debian experimental <debian_experimental>` and :ref:`CentOS testing <yum_testing>` repositories. 
+Percona is glad to announce the release of |Percona XtraBackup| 2.2.1-alpha1 on March 28th 2014. Downloads are available from our download site `here <http://www.percona.com/downloads/XtraBackup/2.2.1/>`_. This **ALPHA** release, will be available in :ref:`Debian testing <debian_testing>` and :ref:`CentOS testing <yum_testing>` repositories. 
 
 This is an **ALPHA** quality release and it is not intended for production. If you want a high quality, Generally Available release, the current Stable version should be used (currently 2.1.8 in the 2.1 series at the time of writing).
 
 
=== modified file 'storage/innobase/xtrabackup/doc/source/release-notes/2.2/2.2.2-beta1.rst'
--- storage/innobase/xtrabackup/doc/source/release-notes/2.2/2.2.2-beta1.rst	2014-05-06 17:08:06 +0000
+++ storage/innobase/xtrabackup/doc/source/release-notes/2.2/2.2.2-beta1.rst	2014-11-05 11:10:08 +0000
@@ -2,7 +2,7 @@
  |Percona XtraBackup| 2.2.2-beta1
 =======================================
 
-Percona is glad to announce the release of |Percona XtraBackup| 2.2.2-beta1 on May 8th 2014. Downloads are available from our download site `here <http://www.percona.com/downloads/XtraBackup/2.2.2/>`_. This **BETA** release will be available in :ref:`Debian experimental <debian_experimental>` and :ref:`CentOS testing <yum_testing>` repositories. 
+Percona is glad to announce the release of |Percona XtraBackup| 2.2.2-beta1 on May 8th 2014. Downloads are available from our download site `here <http://www.percona.com/downloads/XtraBackup/2.2.2/>`_. This **BETA** release will be available in :ref:`Debian testing <debian_testing>` and :ref:`CentOS testing <yum_testing>` repositories. 
 
 This is a **BETA** quality release and it is not intended for production. If you want a high quality, Generally Available release, the current Stable version should be used (currently 2.1.9 in the 2.1 series at the time of writing).
 
 
=== added directory 'storage/innobase/xtrabackup/doc/source/release-notes/2.3'
=== added file 'storage/innobase/xtrabackup/doc/source/release-notes/2.3/2.3.0-alpha1.rst'
--- storage/innobase/xtrabackup/doc/source/release-notes/2.3/2.3.0-alpha1.rst	1970-01-01 00:00:00 +0000
+++ storage/innobase/xtrabackup/doc/source/release-notes/2.3/2.3.0-alpha1.rst	2014-11-05 11:10:08 +0000
@@ -0,0 +1,16 @@
+===================================
+ |Percona XtraBackup| 2.3.0-alpha1
+===================================
+
+Percona is glad to announce the release of |Percona XtraBackup| 2.3.0-alpha1 on October 30th 2014. Downloads are available from our download site `here <http://www.percona.com/downloads/TESTING/XtraBackup/xtrabackup-2.3.0alpha1/>`_. This **ALPHA** release, will be available in :ref:`Debian testing <debian_testing>` and :ref:`CentOS testing <yum_testing>` repositories. 
+
+This is an **ALPHA** quality release and it is not intended for production. If you want a high quality, Generally Available release, the current Stable version should be used (currently 2.2.5 in the 2.2 series at the time of writing).
+
+New features
+------------
+
+ |Percona XtraBackup| has implemented new tool, :ref:`xbcloud_binary`, which can be used to upload/download full or part of |xbstream| archive from/to cloud. 
+ 
+.. note:: 
+
+   In order to sucessfully install Percona Xtrabackup 2.3.0-alpha1 on *CentOS*, ``libev.so.4`` package will need to be installed first. ``libev.so.4`` package can be installed from the `EPEL <https://fedoraproject.org/wiki/EPEL>`_ repositories.
 
=== added directory 'storage/innobase/xtrabackup/doc/source/xbcloud'
=== added file 'storage/innobase/xtrabackup/doc/source/xbcloud/xbcloud.rst'
--- storage/innobase/xtrabackup/doc/source/xbcloud/xbcloud.rst	1970-01-01 00:00:00 +0000
+++ storage/innobase/xtrabackup/doc/source/xbcloud/xbcloud.rst	2014-11-05 11:10:08 +0000
@@ -0,0 +1,87 @@
+.. _xbcloud_binary:
+
+======================
+ The xbcloud Binary
+======================
+
+.. note::
+
+   This feature implementation is considered **ALPHA** quality.
+
+|xbcloud| is a new tool which is part of the |Percona XtraBackup| 2.3.0-alpha1 release. The purpose of |xbcloud| is to download and upload full or part of |xbstream| archive from/to cloud. Archive uploading will employ multipart upload for Amazon and Large Objects on Swift. Along with |xbstream| archive index file will be uploaded which contains list of files and their parts and offsets of those parts in the |xbstream| archive. This index is needed for downloading only part of archive (one or several tables from backups) on demand.
+
+Usage
+-----
+
+Backup: ::
+
+ innobackupex --stream=xbstream /tmp | xbcloud [options] put <name>
+
+Following example shows how to make a full backup and upload it to Swift: :: 
+
+ innobackupex --stream=xbstream --extra-lsndir=/tmp /tmp | \
+ xbcloud put --storage=Swift \
+ --swift-container=test \
+ --swift-user=test:tester \
+ --swift-url=http://192.168.8.80:8080/ \
+ --swift-key=testing \
+ --parallel=10 \
+ full_backup
+
+Restore: :: 
+
+ xbcloud [options] get <name> [<list-of-files>] | xbstream -x
+
+Following example shows how to fetch and restore the backup from Swift: :: 
+
+  xbcloud get --storage=Swift \
+  --swift-container=test \
+  --swift-user=test:tester \
+  --swift-url=http://192.168.8.80:8080/ \
+  --swift-key=testing \
+  full_backup | xbstream -xv -C /tmp/downloaded_full
+
+  innobackupex --apply-log /tmp/downloaded_full
+  innobackupex --copy-back /tmp/downloaded_full
+
+Limitations
+-----------
+
+Restoring individual tables from full cloud backup isn't possible without downloading the entire backup.
+
+Command-line options
+--------------------
+
+|xbcloud| has following command line options:
+
+.. option:: --storage
+
+   Cloud storage option. Only support for Swift is currently implemented. Default is Swift
+
+.. option:: --swift-url 
+
+   URL of Swift cluster
+
+.. option:: --swift-user
+
+   Swift username (X-Auth-User, specific to Swift)
+
+.. option:: --swift-key 
+
+   Swift key/password (X-Auth-Key, specific to Swift)
+
+.. option:: --swift-container 
+
+   Container to backup into (specific to Swift)
+
+.. option:: --parallel=N 
+
+   Maximum number of concurrent upload/download threads. Default is 1.
+
+.. option:: --cacert 
+
+   Path to the file with CA certificates
+
+.. option:: --insecure 
+
+   Do not verify servers certificate
 
=== modified file 'storage/innobase/xtrabackup/innobackupex.pl'
--- storage/innobase/xtrabackup/innobackupex.pl	2014-10-08 16:13:58 +0000
+++ storage/innobase/xtrabackup/innobackupex.pl	2014-11-05 11:10:08 +0000
@@ -77,6 +77,8 @@
 my $have_backup_locks = 0;
 my $have_galera_enabled = 0;
 my $have_flush_engine_logs = 0;
+my $have_multi_threaded_slave = 0;
+my $have_gtid_slave = 0;
 
 # command line options
 my $option_help = '';
@@ -1904,6 +1906,15 @@
 
     detect_mysql_capabilities_for_backup(\%mysql);
 
+
+    # Do not allow --slave-info with a multi-threded non-GTID slave,
+    # see https://bugs.launchpad.net/percona-xtrabackup/+bug/1372679
+    if ($option_slave_info and $have_multi_threaded_slave
+        and !$have_gtid_slave) {
+        die "The --slave-info option requires GTID enabled for a " .
+            "multi-threaded slave."
+    }
+
     #
     # if one of the history incrementals is being used, try to grab the
     # innodb_to_lsn from the history table and set the option_incremental_lsn
@@ -2138,21 +2149,26 @@
 }
 
 #
-# Check if a given directory exists, or fail with an error otherwise
+# Check if a given directory exists, or create one otherwise.
 #
 
 sub if_directory_exists {
     my $empty_dir = shift;
     my $is_directory_empty_comment = shift;
     if (! -d $empty_dir) {
-        die "$is_directory_empty_comment directory '$empty_dir' does not exist!";
+        eval { mkpath($empty_dir) };
+        if ($@) {
+            die "Can not create $is_directory_empty_comment directory " .
+                "'$empty_dir': $@";
+        }
     }
 }
 
 #
 # if_directory_exists_and_empty accepts two arguments:
 # variable with directory name and comment.
-# Sub checks that directory exists and is empty
+# Sub checks that directory exists and is empty 
+# or creates one if it doesn't exists.
 # usage: is_directory_exists_and_empty($directory,"Comment");
 #
 
@@ -2418,7 +2434,7 @@
     my $orig_ibdata_dir = get_option_safe('innodb_data_home_dir',
                                          $orig_datadir);
     my $orig_innodb_data_file_path = get_option_safe('innodb_data_file_path',
-                                                     '');
+                                                     'ibdata1:10M:autoextend');
     my $orig_iblog_dir = get_option_safe('innodb_log_group_home_dir',
                                         $orig_datadir);
     my $orig_undo_dir = get_option_safe('innodb_undo_directory',
@@ -3583,6 +3599,11 @@
     } else {
         $run = 'apply-log';
     }
+
+    my $now = current_time();
+
+    print STDERR "$now  $prefix Starting the $run operation\n\n";
+
     print STDERR "IMPORTANT: Please check that the $run run completes successfully.\n";
     print STDERR "           At the end of a successful $run run $innobackup_script\n";
     print STDERR "           prints \"completed OK!\".\n\n";
@@ -4917,20 +4938,26 @@
 # Query the server to find out what backup capabilities it supports.
 #
 sub detect_mysql_capabilities_for_backup {
+    my $con = shift;
+
     if ($option_incremental) {
         $have_changed_page_bitmaps =
-            mysql_query($_[0], "SELECT COUNT(*) FROM " .
+            mysql_query($con, "SELECT COUNT(*) FROM " .
                         "INFORMATION_SCHEMA.PLUGINS " .
                         "WHERE PLUGIN_NAME LIKE 'INNODB_CHANGED_PAGES'");
     }
 
-    if (!defined($_[0]->{vars})) {
-        get_mysql_vars($_[0]);
-    }
-
-    $have_backup_locks = defined($_[0]->{vars}->{have_backup_locks});
-
-    $have_galera_enabled = defined($_[0]->{vars}->{wsrep_on});
+    if (!defined($con->{vars})) {
+        get_mysql_vars($con);
+    }
+
+    if (!defined($con->{slave_status})) {
+        get_mysql_slave_status($con);
+    }
+
+    $have_backup_locks = defined($con->{vars}->{have_backup_locks});
+
+    $have_galera_enabled = defined($con->{vars}->{wsrep_on});
 
     if ($option_galera_info && !$have_galera_enabled) {
         my $now = current_time();
@@ -4942,7 +4969,7 @@
         $option_galera_info = 0;
     }
 
-    if ($mysql{vars}->{version}->{Value} =~ m/5\.[123]\.\d/) {
+    if ($con->{vars}->{version}->{Value} =~ m/5\.[123]\.\d/) {
         my $now = current_time();
 
         print STDERR "\n$now  $prefix Warning: FLUSH ENGINE LOGS " .
@@ -4954,6 +4981,19 @@
     } else {
         $have_flush_engine_logs = 1;
     }
+
+    if (defined($con->{vars}->{slave_parallel_workers}) and
+        ($con->{vars}->{slave_parallel_workers}->{Value} > 0)) {
+        $have_multi_threaded_slave = 1;
+    }
+
+    my $gtid_executed = $con->{slave_status}->{Executed_Gtid_Set};
+    my $gtid_slave_pos = $con->{vars}->{gtid_slave_pos};
+
+    if ((defined($gtid_executed) and $gtid_executed ne '') or
+        (defined($gtid_slave_pos) and $gtid_slave_pos ne '')) {
+        $have_gtid_slave = 1;
+    }
 }
 
 #
 
=== modified file 'storage/innobase/xtrabackup/src/xtrabackup.cc'
--- storage/innobase/xtrabackup/src/xtrabackup.cc	2014-10-08 18:33:23 +0000
+++ storage/innobase/xtrabackup/src/xtrabackup.cc	2014-11-05 11:10:08 +0000
@@ -2643,6 +2643,8 @@
 	srv_undo_tablespaces_init(), because fil_is_user_tablespace_id() *
 	relies on srv_undo_tablespaces_open to be properly initialized */
 
+	msg("xtrabackup: Generating a list of tablespaces\n");
+
 	err = fil_load_single_table_tablespaces(xb_check_if_open_tablespace);
 	if (err != DB_SUCCESS) {
 		return(err);
 
=== modified file 'storage/innobase/xtrabackup/test/bootstrap.sh'
--- storage/innobase/xtrabackup/test/bootstrap.sh	2014-08-20 08:14:37 +0000
+++ storage/innobase/xtrabackup/test/bootstrap.sh	2014-11-05 11:10:08 +0000
@@ -47,12 +47,12 @@
 
     innodb55)
         url="http://s3.amazonaws.com/percona.com/downloads/community"
-        tarball="mysql-5.5.36-linux2.6-$arch.tar.gz"
+        tarball="mysql-5.5.40-linux2.6-$arch.tar.gz"
         ;;
 
     innodb56)
         url="http://s3.amazonaws.com/percona.com/downloads/community"
-        tarball="mysql-5.6.16-linux-glibc2.5-$arch.tar.gz"
+        tarball="mysql-5.6.21-linux-glibc2.5-$arch.tar.gz"
         ;;
 
     xtradb51)
@@ -62,12 +62,12 @@
 
     xtradb55)
         url="http://s3.amazonaws.com/percona.com/downloads/community/yassl"
-        tarball="Percona-Server-5.5.38-rel35.2-691.Linux.$arch.tar.gz"
+        tarball="Percona-Server-5.5.40-rel36.1-707.Linux.$arch.tar.gz"
         ;;
 
     xtradb56)
         url="http://s3.amazonaws.com/percona.com/downloads/community/yassl"
-        tarball="Percona-Server-5.6.19-rel67.0-648.Linux.$arch.tar.gz"
+        tarball="Percona-Server-5.6.21-rel69.0-675.Linux.$arch.tar.gz"
         ;;
 
     mariadb51)
@@ -87,12 +87,12 @@
 
     mariadb55)
         url="http://s3.amazonaws.com/percona.com/downloads/community"
-        tarball="mariadb-5.5.32-linux-$arch.tar.gz"
+        tarball="mariadb-5.5.40-linux-$arch.tar.gz"
         ;;
 
     mariadb100)
         url="http://s3.amazonaws.com/percona.com/downloads/community"
-        tarball="mariadb-10.0.3-linux-$arch.tar.gz"
+        tarball="mariadb-10.0.14-linux-$arch.tar.gz"
         ;;
 
     *)
 
=== added file 'storage/innobase/xtrabackup/test/t/bug1372679.sh'
--- storage/innobase/xtrabackup/test/t/bug1372679.sh	1970-01-01 00:00:00 +0000
+++ storage/innobase/xtrabackup/test/t/bug1372679.sh	2014-11-05 11:10:08 +0000
@@ -0,0 +1,54 @@
+########################################################################
+# Bug #1372679: innobackupex --slave-info doesn't handle
+#               slave_parallel_workers>0
+########################################################################
+
+require_server_version_higher_than 5.6.0
+
+# Test that --slave-info with MTS enabled + GTID disabled fails
+
+MYSQLD_EXTRA_MY_CNF_OPTS="
+slave_parallel_workers=2
+"
+master_id=1
+slave_id=2
+
+start_server_with_id $master_id
+
+start_server_with_id $slave_id
+
+setup_slave $slave_id $master_id
+
+switch_server $slave_id
+
+innobackupex --no-timestamp --slave-info $topdir/backup 2>&1 |
+    grep 'The --slave-info option requires GTID enabled for a multi-threaded slave' ||
+    die "could not find the error message"
+
+if [[ ${PIPESTATUS[0]} == 0 ]]
+then
+    die "innobackupex did not fail as expected"
+fi
+
+stop_server_with_id $master_id
+stop_server_with_id $slave_id
+
+remove_var_dirs
+
+# Test that --slave-info with MTS enabled + GTID enabled works
+
+MYSQLD_EXTRA_MY_CNF_OPTS="
+gtid_mode=on
+log_slave_updates=on
+enforce_gtid_consistency=on
+slave_parallel_workers=2
+"
+
+start_server_with_id $master_id
+start_server_with_id $slave_id
+
+setup_slave $slave_id $master_id
+
+switch_server $slave_id
+
+innobackupex --no-timestamp --slave-info $topdir/backup
 
=== added file 'storage/innobase/xtrabackup/test/t/bug1382347.sh'
--- storage/innobase/xtrabackup/test/t/bug1382347.sh	1970-01-01 00:00:00 +0000
+++ storage/innobase/xtrabackup/test/t/bug1382347.sh	2014-11-05 11:10:08 +0000
@@ -0,0 +1,39 @@
+###########################################################################
+# Bug1382347: innobackupex should create server directories when copy back
+#             is performed
+###########################################################################
+
+. inc/common.sh
+
+require_server_version_higher_than 5.6.0
+
+mkdir -p ${TEST_VAR_ROOT}/dir/{undo,data,logs}
+
+MYSQLD_EXTRA_MY_CNF_OPTS="
+innodb_file_per_table=1
+innodb_undo_directory=${TEST_VAR_ROOT}/dir/undo
+innodb_undo_tablespaces=4
+innodb_data_home_dir=${TEST_VAR_ROOT}/dir/data
+innodb_log_group_home_dir=${TEST_VAR_ROOT}/dir/logs
+"
+
+start_server
+load_sakila
+
+checksum1=`checksum_table sakila payment`
+test -n "$checksum1" || die "Failed to checksum table sakila.payment"
+
+innobackupex --no-timestamp $topdir/backup
+
+stop_server
+
+rm -rf $MYSQLD_DATADIR
+rm -rf ${TEST_VAR_ROOT}/dir
+
+innobackupex --apply-log $topdir/backup
+innobackupex --copy-back $topdir/backup
+
+start_server
+
+checksum2=`checksum_table sakila payment`
+test -n "$checksum2" || die "Failed to checksum table sakila.payment"
 
=== added file 'storage/innobase/xtrabackup/test/t/bug369913.sh'
--- storage/innobase/xtrabackup/test/t/bug369913.sh	1970-01-01 00:00:00 +0000
+++ storage/innobase/xtrabackup/test/t/bug369913.sh	2014-11-05 11:10:08 +0000
@@ -0,0 +1,15 @@
+#############################################################################
+# Bug #369913: Feature Request: more verbose output during initial table scan
+#############################################################################
+
+start_server
+
+innobackupex --no-timestamp $topdir/backup
+
+egrep -q \
+      '[0-9]{6} [0-9]{2}:[0-9]{2}:[0-9]{2} .* Starting the backup operation' \
+      $OUTFILE \
+    || die "Could not find the operation start message"
+
+grep -q "xtrabackup: Generating a list of tablespaces" $OUTFILE \
+    || die "Could not find \"Generating a list of tablespaces\" message"
 
=== added file 'storage/innobase/xtrabackup/test/t/innodb_data_home_dir.sh'
--- storage/innobase/xtrabackup/test/t/innodb_data_home_dir.sh	1970-01-01 00:00:00 +0000
+++ storage/innobase/xtrabackup/test/t/innodb_data_home_dir.sh	2014-11-05 11:10:08 +0000
@@ -0,0 +1,33 @@
+##############################################################################
+# Test innodb_data_file_dir support
+##############################################################################
+
+. inc/common.sh
+
+mkdir -p ${TEST_VAR_ROOT}/dir/data
+
+MYSQLD_EXTRA_MY_CNF_OPTS="
+innodb_file_per_table=1
+innodb_data_home_dir=${TEST_VAR_ROOT}/dir/data
+"
+
+start_server
+load_sakila
+
+checksum1=`checksum_table sakila payment`
+test -n "$checksum1" || die "Failed to checksum table sakila.payment"
+
+innobackupex --no-timestamp $topdir/backup
+
+stop_server
+
+rm -rf $MYSQLD_DATADIR/*
+rm -rf ${TEST_VAR_ROOT}/dir/data/*
+
+innobackupex --apply-log $topdir/backup
+innobackupex --copy-back $topdir/backup
+
+start_server
+
+checksum2=`checksum_table sakila payment`
+test -n "$checksum2" || die "Failed to checksum table sakila.payment"