Merge lp:~akopytov/percona-xtrabackup/bug930062-2.0 into lp:percona-xtrabackup/2.0

[Alexey Kopytov]

  Bug #930062: Innobackupex doesn't add file-per-table setting for
               table-independent backups

  Made xtrabackup auto-enable innodb_file_per_table when the --export
  option is used and updated xb_export.sh and docs accordingly.

http://jenkins.percona.com/view/XtraBackup/job/percona-xtrabackup-2.0-param/358/

[Sergei Glushchenko (sergei.glushchenko)]

Approve

review: Approve (g2)

=== modified file 'doc/source/xtrabackup_bin/exporting_importing_tables.rst'
--- doc/source/xtrabackup_bin/exporting_importing_tables.rst	2011-07-07 05:32:50 +0000
+++ doc/source/xtrabackup_bin/exporting_importing_tables.rst	2013-03-07 08:14:29 +0000
@@ -18,9 +18,9 @@
   $ find /data/backups/mysql/ -name export_test.*
   /data/backups/mysql/test/export_test.ibd
 
-when you prepare the backup, add the extra parameter :option:`--export` to the command. If you do not have :term:`innodb_file_per_table` in your `my.cnf`, you must add that to the command-line options. Here is an example: ::
+when you prepare the backup, add the extra parameter :option:`--export` to the command. Here is an example: ::
 
-  $ xtrabackup --prepare --export --innodb-file-per-table --target-dir=/data/backups/mysql/
+  $ xtrabackup --prepare --export --target-dir=/data/backups/mysql/
 
 Now you should see a :term:`.exp` file in the target directory: ::
 

=== modified file 'src/xtrabackup.cc'
--- src/xtrabackup.cc	2013-03-01 06:54:51 +0000
+++ src/xtrabackup.cc	2013-03-07 08:14:29 +0000
@@ -7208,6 +7208,8 @@
 		if (innobase_doublewrite_file != NULL) {
 			printf("innodb_doublewrite_file = %s\n", innobase_doublewrite_file);
 		}
+		printf("innodb_file_per_table = %d\n",
+		       (int) innobase_file_per_table);
 #endif
 		exit(EXIT_SUCCESS);
 	}
@@ -7231,9 +7233,9 @@
 	}
 
 	if (xtrabackup_export && innobase_file_per_table == FALSE) {
-		msg("xtrabackup: error: --export option can only "
-		    "be used with --innodb-file-per-table=ON.\n");
-		exit(EXIT_FAILURE);
+		msg("xtrabackup: auto-enabling --innodb-file-per-table due to "
+		    "the --export option\n");
+		innobase_file_per_table = TRUE;
 	}
 
 	if (xtrabackup_incremental && xtrabackup_stream &&

=== added file 'test/t/bug930062.sh'
--- test/t/bug930062.sh	1970-01-01 00:00:00 +0000
+++ test/t/bug930062.sh	2013-03-07 08:14:29 +0000
@@ -0,0 +1,61 @@
+########################################################################
+# Bug #930062: Innobackupex doesn't add file-per-table setting for
+#              table-independent backups
+########################################################################
+
+. inc/common.sh
+
+if [ -z "$XTRADB_VERSION" ]; then
+    echo "Requires XtraDB" > $SKIPPED_REASON
+    exit $SKIPPED_EXIT_CODE
+fi
+
+if [ ${MYSQL_VERSION:0:3} = "5.5" ]
+then
+    import_option="--innodb_import_table_from_xtrabackup=1"
+else
+    import_option="--innodb_expand_import=1"
+fi
+
+mysql_extra_args="--innodb_file_per_table $import_option"
+
+start_server $mysql_extra_args
+
+backup_dir=$topdir/backup
+
+load_dbase_schema sakila
+load_dbase_data sakila
+
+checksum_1=`checksum_table sakila actor`
+
+innobackupex --no-timestamp --include='actor' $backup_dir
+
+stop_server
+
+# Test that there's no innodb_file_per_table = 1 in any of configuration sources
+cnt=`xtrabackup --print-param | grep -c 'innodb_file_per_table = 1' || true`
+if [ "$cnt" -ne 0 ]
+then
+    vlog "innodb_file_per_table is enabled by default"
+    exit 1
+fi
+
+innobackupex --apply-log --export $backup_dir
+
+start_server $mysql_extra_args
+
+run_cmd ${MYSQL} ${MYSQL_ARGS} sakila <<EOF
+SET foreign_key_checks=0;
+ALTER TABLE actor DISCARD TABLESPACE;
+EOF
+
+run_cmd cp $backup_dir/sakila/actor* $MYSQLD_DATADIR/sakila/
+run_cmd ${MYSQL} ${MYSQL_ARGS} -e "ALTER TABLE actor IMPORT TABLESPACE" sakila
+
+checksum_2=`checksum_table sakila actor`
+
+if [ "$checksum_1" != "$checksum_2" ]
+then
+    vlog "Table checksums mismatch."
+    exit 1
+fi

=== modified file 'test/t/xb_export.sh'
--- test/t/xb_export.sh	2012-10-15 16:14:59 +0000
+++ test/t/xb_export.sh	2013-03-07 08:14:29 +0000
@@ -54,14 +54,6 @@
 
 run_cmd ${MYSQL} ${MYSQL_ARGS} -e "alter table test discard tablespace;" incremental_sample
 
-# Test the with innodb_file_per_table=0 --export bails out with an error
-# (bug #758888)
-
-run_cmd_expect_failure $XB_BIN $XB_ARGS --datadir=$mysql_datadir --prepare \
-    --export --target-dir=$backup_dir --innodb-file-per-table=0
-
-XB_ARGS="$XB_ARGS --innodb-file-per-table=1"
-
 xtrabackup --datadir=$mysql_datadir --prepare --export \
     --target-dir=$backup_dir