Merge lp:~sergei.glushchenko/percona-xtrabackup/bug733651_mycnf_opt-1.6 into lp:percona-xtrabackup/2.0

[Sergei Glushchenko]

Bugfix for #733651 from 1.6

[Alexey Kopytov (akopytov)]

OK to merge.

review: Approve

=== modified file 'innobackupex'
--- innobackupex	2012-01-31 01:46:10 +0000
+++ innobackupex	2012-01-31 13:01:26 +0000
@@ -1643,10 +1643,6 @@
     my $filename = shift;
     my $innodb_data_file_path = 
         get_option(\%config, 'mysqld', 'innodb_data_file_path');
-    my $innodb_log_files_in_group =
-        get_option(\%config, 'mysqld', 'innodb_log_files_in_group');
-    my $innodb_log_file_size =
-        get_option(\%config, 'mysqld', 'innodb_log_file_size');
     my $root;
 
     my @array = split(/;/, $innodb_data_file_path);
@@ -1665,15 +1661,29 @@
             || Die "Failed to open file '$option_remote_host:$filename': $!";
     }
 
-    print FILE "# This MySQL options file was generated by $innobackup_script.\n\n" .
+    my @option_names = (
+        "innodb_log_files_in_group",
+        "innodb_log_file_size",
+        "innodb_fast_checksum",
+        "innodb_page_size",
+        "innodb_log_block_size",
+        );
+
+    my $options_dump = "# This MySQL options file was generated by $innobackup_script.\n\n" .
           "# The MySQL server\n" .
           "[mysqld]\n" .
           "datadir=$root\n" .
-          "innodb_data_home_dir=$root\n" .
-          "innodb_data_file_path=$innodb_data_file_path\n" .
-          "innodb_log_group_home_dir=$root\n" .
-          "innodb_log_files_in_group=$innodb_log_files_in_group\n" .
-          "innodb_log_file_size=$innodb_log_file_size\n";
+          "innodb_data_home_dir=$root\n";
+
+    my $option_name;
+    foreach $option_name (@option_names) {
+        if (has_option(\%config, 'mysqld', $option_name)) {
+            my $option_value = get_option(\%config, 'mysqld', $option_name);
+            $options_dump .= "$option_name=$option_value\n";
+        }
+    }
+
+    print FILE $options_dump;
     close(FILE);
 
     if ($option_stream) {
@@ -2286,7 +2296,33 @@
 }
     
 
+# has_option return whether the config has an option with the given name
+#    Parameters:
+#       config_ref   a reference to a config data
+#       group        option group name
+#       option_name  name of the option
+#    Return value:
+#       true if option exists, otherwise false
 #
+sub has_option {
+    my $config_ref = shift;
+    my $group = shift;
+    my $option_name = shift;
+    my $group_hash_ref;
+
+    if (!exists ${$config_ref}{$group}) {
+        # no group
+        print STDERR "$prefix fatal error: no '$group' group in MySQL options\n";
+        print STDERR "$prefix fatal error: OR no 'datadir' option in group '$group' in MySQL options\n";
+        exit(1);
+    }
+
+    $group_hash_ref = ${$config_ref}{$group};
+    
+    return exists ${$group_hash_ref}{$option_name};
+}
+    
+
 # get_option subroutine returns the value of given option in the config
 # structure. If option is missing, this subroutine calls exit.
 #    Parameters:
 
=== added file 'test/t/bug733651.sh'
--- test/t/bug733651.sh	1970-01-01 00:00:00 +0000
+++ test/t/bug733651.sh	2012-01-31 13:01:26 +0000
@@ -0,0 +1,32 @@
+########################################################################
+# Bug #733651: innobackupex not stores some critical
+# innodb options in backup-my.cnf
+########################################################################
+
+. inc/common.sh
+
+init
+
+options="innodb_log_files_in_group innodb_log_file_size"
+if [ ! -z "$XTRADB_VERSION" ]; then
+    options="$options innodb_page_size innodb_fast_checksum innodb_log_block_size"
+fi
+
+run_mysqld
+
+mkdir -p $topdir/backup
+innobackupex  $topdir/backup
+backup_dir=`grep "innobackupex: Backup created in directory" $OUTFILE | awk -F\' '{ print $2}'`
+vlog "Backup created in directory $backup_dir"
+
+# test presence of options
+for option in $options ; do
+
+	if [ "`cat $backup_dir/backup-my.cnf | grep $option | wc -l`" == "0" ] ; then
+		vlog "Option $option is absent"
+		exit -1
+	else
+		vlog "Option $option is present"
+	fi
+
+done
 
=== modified file 'xtrabackup.c'
--- xtrabackup.c	2012-01-31 01:46:10 +0000
+++ xtrabackup.c	2012-01-31 13:01:26 +0000
@@ -6436,6 +6436,11 @@
 		printf("innodb_flush_method = \"%s\"\n",
 		       (innobase_unix_file_flush_method != NULL) ?
 		       innobase_unix_file_flush_method : "");
+#ifdef XTRADB_BASED
+		printf("innodb_fast_checksum = %d\n", innobase_fast_checksum);
+		printf("innodb_page_size = %ld\n", innobase_page_size);
+		printf("innodb_log_block_size = %lu\n", innobase_log_block_size);
+#endif
 		exit(EXIT_SUCCESS);
 	}