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

[Laurynas Biveinis]

Automerge bug 1021249 fix from 2.0

[Laurynas Biveinis (laurynas-biveinis)]

Setting to approved because the 2.0 fix has been approved.

review: Approve

=== modified file 'test/t/ib_incremental.sh'
--- test/t/ib_incremental.sh	2012-06-05 12:35:33 +0000
+++ test/t/ib_incremental.sh	2012-08-01 11:11:23 +0000
@@ -26,18 +26,22 @@
 # Changing data
 
 vlog "Making changes to database"
+${MYSQL} ${MYSQL_ARGS} -e "create table t2 (a int(11) default null, number int(11) default null) engine=innodb" incremental_sample
 let "count=numrow+1"
-let "numrow=500"
+let "numrow=1000"
 while [ "$numrow" -gt "$count" ]
 do
 	${MYSQL} ${MYSQL_ARGS} -e "insert into test values ($count, $numrow);" incremental_sample
+	${MYSQL} ${MYSQL_ARGS} -e "insert into t2 values ($count, $numrow);" incremental_sample
 	let "count=count+1"
 done
 vlog "Changes done"
 
 # Saving the checksum of original table
-checksum_a=`checksum_table incremental_sample test`
-vlog "Table checksum is $checksum_a"
+checksum_test_a=`checksum_table incremental_sample test`
+checksum_t2_a=`checksum_table incremental_sample t2`
+vlog "Table 'test' checksum is $checksum_test_a"
+vlog "Table 't2' checksum is $checksum_t2_a"
 
 vlog "Making incremental backup"
 
@@ -86,11 +90,18 @@
 start_server --innodb_file_per_table
 
 vlog "Checking checksums"
-checksum_b=`checksum_table incremental_sample test`
-
-if [ "$checksum_a" != "$checksum_b"  ]
-then 
-	vlog "Checksums are not equal"
+checksum_test_b=`checksum_table incremental_sample test`
+checksum_t2_b=`checksum_table incremental_sample t2`
+
+if [ "$checksum_test_a" != "$checksum_test_b"  ]
+then 
+	vlog "Checksums for table 'test' are not equal"
+	exit -1
+fi
+
+if [ "$checksum_t2_a" != "$checksum_t2_b"  ]
+then 
+	vlog "Checksums for table 't2' are not equal"
 	exit -1
 fi
 

=== modified file 'test/t/xb_incremental.sh'
--- test/t/xb_incremental.sh	2012-06-05 12:35:33 +0000
+++ test/t/xb_incremental.sh	2012-08-01 11:11:23 +0000
@@ -36,20 +36,24 @@
 
 vlog "Making changes to database"
 
+${MYSQL} ${MYSQL_ARGS} -e "create table t2 (a int(11) default null, number int(11) default null) engine=innodb" incremental_sample
 let "count=numrow+1"
-let "numrow=500"
+let "numrow=1000"
 while [ "$numrow" -gt "$count" ]
 do
 	${MYSQL} ${MYSQL_ARGS} -e "insert into test values ($count, $numrow);" incremental_sample
+        ${MYSQL} ${MYSQL_ARGS} -e "insert into t2 values ($count, $numrow);" incremental_sample
 	let "count=count+1"
 done
 
 vlog "Changes done"
 
 # Saving the checksum of original table
-checksum_a=`checksum_table incremental_sample test`
+checksum_test_a=`checksum_table incremental_sample test`
+checksum_t2_a=`checksum_table incremental_sample t2`
 
-vlog "Table checksum is $checksum_a"
+vlog "Table 'test' checksum is $checksum_test_a"
+vlog "Table 't2' checksum is $checksum_t2_a"
 vlog "Making incremental backup"
 
 # Incremental backup
@@ -69,8 +73,9 @@
 vlog "Data prepared for restore"
 
 # removing rows
-vlog "Table cleared"
 run_cmd ${MYSQL} ${MYSQL_ARGS} -e "delete from test;" incremental_sample
+run_cmd ${MYSQL} ${MYSQL_ARGS} -e "delete from t2;" incremental_sample
+vlog "Tables cleared"
 
 # Restore backup
 stop_server
@@ -83,11 +88,18 @@
 start_server --innodb_file_per_table
 
 vlog "Checking checksums"
-checksum_b=`checksum_table incremental_sample test`
-
-if [ "$checksum_a" != "$checksum_b"  ]
-then 
-	vlog "Checksums are not equal"
+checksum_test_b=`checksum_table incremental_sample test`
+checksum_t2_b=`checksum_table incremental_sample t2`
+
+if [ "$checksum_test_a" != "$checksum_test_b"  ]
+then 
+	vlog "Checksums of table 'test' are not equal"
+	exit -1
+fi
+
+if [ "$checksum_t2_a" != "$checksum_t2_b"  ]
+then 
+	vlog "Checksums of table 't2' are not equal"
 	exit -1
 fi
 

=== modified file 'test/t/xb_incremental_compressed.sh'
--- test/t/xb_incremental_compressed.sh	2012-06-05 12:35:33 +0000
+++ test/t/xb_incremental_compressed.sh	2012-08-01 11:11:23 +0000
@@ -23,7 +23,8 @@
   # Use innodb_strict_mode so that failure to use compression results in an 
   # error rather than a warning
   mysqld_additional_args="--innodb_strict_mode --innodb_file_per_table \
-      --innodb_file_format=Barracuda"
+      --innodb_file_format=Barracuda --innodb_max_dirty_pages_pct=0 \
+      --innodb_log_file_size=1M"
   
   start_server ${mysqld_additional_args}
 
@@ -71,7 +72,7 @@
 
   vlog "Starting backup"
 
-  xtrabackup --datadir=$mysql_datadir --backup --target-dir=$topdir/data/full
+  xtrabackup --datadir=$mysql_datadir --backup --target-dir=$topdir/data/full ${mysqld_additional_args}
 
   vlog "Full backup done"
 
@@ -79,56 +80,72 @@
 
   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
+
   let "count=numrow+1"
   let "numrow=15000"
   while [ "$numrow" -gt "$count" ]; do
-    sql="INSERT INTO test VALUES ($count, $numrow)"
+    sql="VALUES ($count, $numrow)"
     let "count=count+1"
     for ((i=0; $i<99; i++)); do
       sql="${sql},($count, $numrow)"
       let "count=count+1"
     done
-    ${MYSQL} ${MYSQL_ARGS} -e "$sql" incremental_sample
+    ${MYSQL} ${MYSQL_ARGS} -e "INSERT INTO test $sql" incremental_sample
+    ${MYSQL} ${MYSQL_ARGS} -e "INSERT INTO t2 $sql" incremental_sample
   done
 
   rows=`${MYSQL} ${MYSQL_ARGS} -Ns -e "SELECT COUNT(*) FROM test" \
 incremental_sample`
   if [ "$rows" != "15000" ]; then
-    vlog "Failed to add more rows"
+    vlog "Failed to add more rows to 'test'"
     exit -1
   fi
 
+  rows=`${MYSQL} ${MYSQL_ARGS} -Ns -e "SELECT COUNT(*) FROM t2" \
+incremental_sample`
+  if [ "$rows" != "5000" ]; then
+    vlog "Failed to add more rows to 't2'"
+    exit -1
+  fi
+  
   vlog "Changes done"
 
   # Saving the checksum of original table
-  checksum_a=`checksum_table incremental_sample test`
+  checksum_test_a=`checksum_table incremental_sample test`
+  checksum_t2_a=`checksum_table incremental_sample t2`
 
-  vlog "Table checksum is $checksum_a"
+  vlog "Table 'test' checksum is $checksum_test_a"
+  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
+      --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
+      --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
+      --incremental-dir=$topdir/data/delta ${mysqld_additional_args}
   vlog "Delta applied to backup"
   xtrabackup --datadir=$mysql_datadir --prepare \
-      --target-dir=$topdir/data/full
+      --target-dir=$topdir/data/full ${mysqld_additional_args}
   vlog "Data prepared for restore"
 
   # removing rows
-  vlog "Table cleared"
   ${MYSQL} ${MYSQL_ARGS} -e "delete from test;" incremental_sample
+  ${MYSQL} ${MYSQL_ARGS} -e "delete from t2;" incremental_sample
+  vlog "Tables cleared"
 
   # Restore backup
 
@@ -144,12 +161,19 @@
 
   start_server ${mysqld_additional_args}
 
-  vlog "Cheking checksums"
-  checksum_b=`checksum_table incremental_sample test`
-
-  if [ "$checksum_a" != "$checksum_b"  ]
-      then 
-      vlog "Checksums are not equal"
+  vlog "Checking checksums"
+  checksum_test_b=`checksum_table incremental_sample test`
+  checksum_t2_b=`checksum_table incremental_sample t2`
+
+  if [ "$checksum_test_a" != "$checksum_test_b"  ]
+      then 
+      vlog "Checksums of table 'test' are not equal"
+      exit -1
+  fi
+
+  if [ "$checksum_t2_a" != "$checksum_t2_b"  ]
+      then 
+      vlog "Checksums of table 't2' are not equal"
       exit -1
   fi