Merge lp:~akopytov/percona-xtrabackup/innodb_checksum_algorithm-2.2 into lp:percona-xtrabackup/2.2

[Alexey Kopytov]

Bug #1247586: xtrabackup_56 defaults to innodb_checksum_algorithm=crc32

Fixed by changing the default value from 0 to
SRV_CHECKSUM_ALGORITHM_INNODB.

Bug #1248065: innodb_checksum_algorithm should be stored in
backup-my.cnf

Modified both innobackupex and the xtrabackup binary so that
innodb_checksum_algorithm is stored in backup-my.cnf

http://jenkins.percona.com/view/XtraBackup/job/percona-xtrabackup-2.2-param/29/

[George Ormond Lorch III (gl-az)]

review: Approve (g2)

=== modified file 'xtrabackup/innobackupex'
--- xtrabackup/innobackupex	2013-11-03 13:19:35 +0000
+++ xtrabackup/innobackupex	2013-11-05 11:55:35 +0000
@@ -3637,6 +3637,7 @@
     my $filename = shift;
 
     my @option_names = (
+        "innodb_checksum_algorithm",
         "innodb_data_file_path",
         "innodb_log_files_in_group",
         "innodb_log_file_size",
 
=== modified file 'xtrabackup/src/xtrabackup.cc'
--- xtrabackup/src/xtrabackup.cc	2013-08-26 06:59:09 +0000
+++ xtrabackup/src/xtrabackup.cc	2013-11-05 11:55:35 +0000
@@ -869,7 +869,7 @@
   "The algorithm InnoDB uses for page checksumming. [CRC32, STRICT_CRC32, "
    "INNODB, STRICT_INNODB, NONE, STRICT_NONE]", &srv_checksum_algorithm,
    &srv_checksum_algorithm, &innodb_checksum_algorithm_typelib, GET_ENUM,
-   REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+   REQUIRED_ARG, SRV_CHECKSUM_ALGORITHM_INNODB, 0, 0, 0, 0, 0},
   {"innodb_undo_directory", OPT_INNODB_UNDO_DIRECTORY,
    "Directory where undo tablespace files live, this path can be absolute.",
    (G_PTR*) &srv_undo_dir, (G_PTR*) &srv_undo_dir,
@@ -5940,6 +5940,9 @@
 			       srv_undo_dir);
 		}
 		printf("innodb_undo_tablespaces = %lu\n", srv_undo_tablespaces);
+		printf("innodb_checksum_algorithm = %s\n",
+		       innodb_checksum_algorithm_names[srv_checksum_algorithm]
+		       );
 #endif
 		printf("innodb_buffer_pool_filename = \"%s\"\n",
 			innobase_buffer_pool_filename ?
 
=== added file 'xtrabackup/test/t/bug1247586.sh'
--- xtrabackup/test/t/bug1247586.sh	1970-01-01 00:00:00 +0000
+++ xtrabackup/test/t/bug1247586.sh	2013-11-05 11:55:35 +0000
@@ -0,0 +1,12 @@
+##########################################################################
+# Bug #1247586: xtrabackup_56 defaults to innodb_checksum_algorithm=crc32
+##########################################################################
+
+require_server_version_higher_than 5.6.0
+
+if ! xtrabackup --help 2>&1 |
+       egrep '^innodb-checksum-algorithm[[:space:]]+innodb$'
+then
+    die "XtraBackup is using an incorrect default value for \
+--innodb-checksum-algorithm"
+fi
 
=== added file 'xtrabackup/test/t/bug1248065.sh'
--- xtrabackup/test/t/bug1248065.sh	1970-01-01 00:00:00 +0000
+++ xtrabackup/test/t/bug1248065.sh	2013-11-05 11:55:35 +0000
@@ -0,0 +1,49 @@
+############################################################################
+# Bug #1248065: innodb_checksum_algorithm should be stored in backup-my.cnf
+############################################################################
+
+require_server_version_higher_than 5.6.0
+
+function test_with_checksum_algo()
+{
+    vlog "**************************************"
+    vlog "Testing with innodb_checksum_algorithm=$1"
+    vlog "**************************************"
+
+    MYSQLD_EXTRA_MY_CNF_OPTS="
+innodb_checksum_algorithm=$1
+"
+
+    start_server
+    load_sakila
+
+    record_db_state sakila
+
+    innobackupex --no-timestamp $topdir/backup
+
+    egrep '^innodb_checksum_algorithm='$1'$' $topdir/backup/backup-my.cnf
+
+    stop_server
+    rm -rf $MYSQLD_DATADIR/*
+
+    innobackupex --apply-log --defaults-file=$topdir/backup/backup-my.cnf \
+                 $topdir/backup
+
+    innobackupex --copy-back $topdir/backup
+
+    rm -rf $topdir/backup
+
+    start_server
+
+    verify_db_state sakila
+
+    stop_server
+
+    rm -rf $MYSQLD_VARDIR
+}
+
+# Test with strict_* values to force errors on algorithm mismatch
+
+test_with_checksum_algo strict_none
+test_with_checksum_algo strict_crc32
+test_with_checksum_algo strict_innodb