Merge lp:~laurynas-biveinis/percona-xtrabackup/bug1028949-2.1 into lp:percona-xtrabackup/2.1

[Laurynas Biveinis]

Automerge bug 1028949 fix from 2.0

[Laurynas Biveinis (laurynas-biveinis)]

Fix for 2.0 was approved, setting this automerge to approved too.

review: Approve

=== modified file 'src/xtrabackup.c'
--- src/xtrabackup.c	2012-08-01 10:52:18 +0000
+++ src/xtrabackup.c	2012-08-01 10:52:18 +0000
@@ -3820,6 +3820,7 @@
 	ibool		ok;
 	fil_space_t*	fil_space;
 	os_file_t	file	= 0;
+	ulint		tablespace_flags;
 
 	ut_a(dbname || space_id == 0);
 
@@ -3909,8 +3910,24 @@
 	to ensure the correct tablespace image.  */
 
 #ifdef INNODB_VERSION_SHORT
-	if (!fil_space_create(dest_space_name, space_id,
-		zip_size, FIL_TABLESPACE)) {
+	/* Calculate correct tablespace flags for compressed tablespaces.  Do
+	not bother to set all flags correctly, just enough for
+	fil_space_create() to work.  The full flags will be restored from the
+	delta later.  */
+	if (!zip_size) {
+		tablespace_flags = 0;
+	}
+	else {
+		tablespace_flags
+			= (get_bit_shift(zip_size >> PAGE_ZIP_MIN_SIZE_SHIFT
+					 << 1)
+			   << DICT_TF_ZSSIZE_SHIFT)
+			| DICT_TF_COMPACT
+			| (DICT_TF_FORMAT_ZIP << DICT_TF_FORMAT_SHIFT);
+	}
+	ut_a(dict_table_flags_to_zip_size(tablespace_flags) == zip_size);
+	if (!fil_space_create(dest_space_name, space_id, tablespace_flags,
+			      FIL_TABLESPACE)) {
 #else
 	if (!fil_space_create(dest_space_name, space_id,
 		FIL_TABLESPACE)) {

=== added file 'test/t/bug1028949.sh'
--- test/t/bug1028949.sh	1970-01-01 00:00:00 +0000
+++ test/t/bug1028949.sh	2012-08-01 10:52:18 +0000
@@ -0,0 +1,110 @@
+. inc/common.sh
+
+if [ -z "$INNODB_VERSION" ]; then
+    echo "Requires InnoDB plugin or XtraDB" >$SKIPPED_REASON
+    exit $SKIPPED_EXIT_CODE
+fi
+
+function test_bug_1028949()
+{
+  page_size=$1
+
+  mysqld_additional_args="--innodb_file_per_table --innodb_strict_mode \
+--innodb_file_format=Barracuda"
+  
+  start_server ${mysqld_additional_args}
+
+  load_dbase_schema incremental_sample
+
+  # Full backup
+
+  # Full backup folder
+  rm -rf $topdir/data/full
+  mkdir -p $topdir/data/full
+  # Incremental data
+  rm -rf $topdir/data/delta
+  mkdir -p $topdir/data/delta
+
+  vlog "Starting backup"
+
+  xtrabackup --datadir=$mysql_datadir --backup --target-dir=$topdir/data/full \
+      $mysqld_additional_args
+
+  vlog "Full backup done"
+
+  # Changing data in sakila
+
+  vlog "Making changes to database"
+
+  ${MYSQL} ${MYSQL_ARGS} -e "CREATE TABLE t2 (a INT(11) DEFAULT NULL, \
+ number INT(11) DEFAULT NULL) ENGINE=INNODB\
+ ROW_FORMAT=compressed KEY_BLOCK_SIZE=$page_size" incremental_sample
+  ${MYSQL} ${MYSQL_ARGS} -e "INSERT INTO t2 VALUES (1, 1)" incremental_sample
+  
+  vlog "Changes done"
+
+  # Saving the checksum of original table
+  checksum_t2_a=`checksum_table incremental_sample t2`
+
+  vlog "Table 't2' checksum is $checksum_t2_a"
+
+  vlog "Making incremental backup"
+
+  # Incremental backup
+  xtrabackup --datadir=$mysql_datadir --backup \
+      --target-dir=$topdir/data/delta --incremental-basedir=$topdir/data/full \
+      $mysqld_additional_args
+
+  vlog "Incremental backup done"
+  vlog "Preparing backup"
+
+  # Prepare backup
+  xtrabackup --datadir=$mysql_datadir --prepare --apply-log-only \
+      --target-dir=$topdir/data/full $mysqld_additional_args
+  vlog "Log applied to backup"
+
+  xtrabackup --datadir=$mysql_datadir --prepare --apply-log-only \
+      --target-dir=$topdir/data/full --incremental-dir=$topdir/data/delta \
+      $mysqld_additional_args
+  vlog "Delta applied to backup"
+
+  xtrabackup --datadir=$mysql_datadir --prepare --target-dir=$topdir/data/full \
+      $mysqld_additional_args
+  vlog "Data prepared for restore"
+
+  # removing rows
+  ${MYSQL} ${MYSQL_ARGS} -e "delete from t2;" incremental_sample
+  vlog "Table cleared"
+
+  # Restore backup
+
+  stop_server
+
+  vlog "Copying files"
+
+  cd $topdir/data/full/
+  cp -r * $mysql_datadir
+  cd -
+
+  vlog "Data restored"
+
+  start_server ${mysqld_additional_args}
+
+  vlog "Checking checksums"
+  checksum_t2_b=`checksum_table incremental_sample t2`
+
+  if [ "$checksum_t2_a" != "$checksum_t2_b"  ]
+  then 
+      vlog "Checksums of table 't2' are not equal"
+      exit -1
+  fi
+
+  vlog "Checksums are OK"
+
+  stop_server
+}
+
+for page_size in 1 2 4 8 16; do
+    test_bug_1028949 ${page_size}
+    clean
+done