Merge lp:~sergei.glushchenko/percona-xtrabackup/xb1.6-bug996493 into lp:percona-xtrabackup/1.6

[Sergei Glushchenko]

Bug 996493: innobackupex --apply-log doesn't read config from backup-my.cnf
Following have been done:
1. Remove datadir and innodb_data_home_dir from backup-my.cnf
2. When do --apply-log read settings from backup-my.cnf
3. When do --copy-back read settings from /etc/my.cnf

Resolved conflicts from previous MP request

[Sergei Glushchenko (sergei.glushchenko)]

http://jenkins.percona.com/view/Percona%20Xtrabackup/job/percona-xtrabackup-1.6-param/126/

[Alexey Kopytov (akopytov)]

review: Approve

[Stewart Smith (stewart)]

Conflicts with 1.6 branch now that https://code.launchpad.net/~sergei.glushchenko/percona-xtrabackup/bug983685-xb1.6/+merge/102287 has been merged.

review: Needs Fixing

[Alexey Kopytov (akopytov)]

review: Approve

[Stewart Smith (stewart)]

doesn't cleanly merge into 2.0, may need a corresponding 2.0 branch

review: Needs Fixing

[Alexey Kopytov (akopytov)]

This has already been merged into 2.0 (and released in 2.0.1). In 2.0 branch:

$ bzr missing --other lp:~sergei.glushchenko/percona-xtrabackup/xb1.6-bug996493
Other branch has no new revisions.

[Stewart Smith (stewart)]

review: Approve

=== modified file 'doc/source/innobackupex/restoring_a_backup_ibk.rst'
--- doc/source/innobackupex/restoring_a_backup_ibk.rst	2012-02-16 17:05:16 +0000
+++ doc/source/innobackupex/restoring_a_backup_ibk.rst	2012-05-18 05:40:22 +0000
@@ -6,7 +6,7 @@
 
   $ innobackupex --copy-back /path/to/BACKUP-DIR
 
-It will copy all the data-related files back to the server's :term:`datadir`, determined by the :file:`backup-my.cnf` configuration file in the directory. You should check the last line of the output for a success message::
+It will copy all the data-related files back to the server's :term:`datadir`, determined by the server's :file:`my.cnf` configuration file. You should check the last line of the output for a success message::
 
   innobackupex: Finished copying back files.
 

=== modified file 'innobackupex'
--- innobackupex	2012-04-17 12:44:49 +0000
+++ innobackupex	2012-05-18 05:40:22 +0000
@@ -707,6 +707,8 @@
 
     if ($option_defaults_file) {
         $options = $options . " --defaults-file=\"$option_defaults_file\" ";
+    } else {
+        $options = $options . " --defaults-file=\"${backup_dir}/backup-my.cnf\" ";
     }
 
     $options = $options . "--prepare --target-dir=$backup_dir";
@@ -1594,22 +1596,10 @@
 #
 sub write_backup_config_file {
     my $filename = shift;
-    my $innodb_data_file_path = 
-        get_option(\%config, 'mysqld', 'innodb_data_file_path');
-    my $root;
-
-    my @array = split(/;/, $innodb_data_file_path);
-    for (my $i = 0; $i <= $#array; $i++) {
-        my @tmp = split(/\/+/, $array[$i]);
-        $array[$i] = $tmp[-1];
-    }
-    $innodb_data_file_path = join(";", @array);
 
     if (!$option_remote_host) {
-        $root = $backup_dir;
         open(FILE, "> $filename") || Die "Failed to open file '$filename': $!";
     } else {
-        $root = `ssh $option_ssh_opt $option_remote_host 'cd $backup_dir; pwd'`;
         open(FILE, "| ssh $option_ssh_opt $option_remote_host 'cat > $filename'")
             || Die "Failed to open file '$option_remote_host:$filename': $!";
     }
@@ -1625,10 +1615,7 @@
 
     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_log_group_home_dir=$root\n";
+          "[mysqld]\n";
 
     my $option_name;
     foreach $option_name (@option_names) {
@@ -2187,8 +2174,11 @@
     my $cmdline = '';
     my $options = '';
 
+
     if ($option_defaults_file) {
         $options = $options . " --defaults-file=\"$option_defaults_file\" ";
+    } elsif ($option_apply_log) {
+        $options = $options . " --defaults-file=\"${backup_dir}/backup-my.cnf\" ";
     }
 
     $options = $options . "--print-param";
@@ -2274,7 +2264,6 @@
     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);
     }
 
@@ -2302,7 +2291,6 @@
     if (!exists $config{$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);
     }
     

=== modified file 'test/t/bug983685.sh'
--- test/t/bug983685.sh	2012-04-17 12:44:49 +0000
+++ test/t/bug983685.sh	2012-05-18 05:40:22 +0000
@@ -6,7 +6,7 @@
 
 init
 
-options="innodb_data_file_path innodb_log_group_home_dir"
+options="innodb_data_file_path"
 
 run_mysqld
 

=== added file 'test/t/bug996493.sh'
--- test/t/bug996493.sh	1970-01-01 00:00:00 +0000
+++ test/t/bug996493.sh	2012-05-18 05:40:22 +0000
@@ -0,0 +1,39 @@
+########################################################################
+# Bug #996493: innobackupex --apply-log doesn't read config from
+# backup-my.cnf
+########################################################################
+
+. inc/common.sh
+
+init
+
+run_mysqld
+
+backup_dir=$topdir/backup
+innobackupex --no-timestamp $backup_dir
+vlog "Backup created in directory $backup_dir"
+
+vlog "Stop mysqld"
+stop_mysqld
+
+vlog "Remove datadir"
+rm -r $mysql_datadir/*
+
+vlog "Remove my.cnf"
+mv $topdir/my.cnf $topdir/my.cnf.bak
+
+trap "vlog restoring $topdir/my.cnf ; \
+mv $topdir/my.cnf.bak $topdir/my.cnf" INT TERM EXIT
+
+vlog "Apply log"
+# Do not run innobackupex, because it pass option --defaults-file
+# which we should avoid. Our goal is to test that backup-my.cnf
+# will be read by default when apply-log is run.
+run_cmd $IB_BIN --ibbackup=$XB_BIN --apply-log $backup_dir
+
+vlog "Get my.cnf back"
+mv $topdir/my.cnf.bak $topdir/my.cnf
+trap "vlog test exit" INT TERM EXIT
+
+vlog "Copy back"
+innobackupex --copy-back $backup_dir

=== modified file 'xtrabackup.c'
--- xtrabackup.c	2012-03-27 01:07:43 +0000
+++ xtrabackup.c	2012-05-18 05:40:22 +0000
@@ -6063,7 +6063,7 @@
 	if ((ho_error=handle_options(&argc, &argv, my_long_options, get_one_option)))
 		exit(ho_error);
 
-	if ((!xtrabackup_prepare) && (strcmp(mysql_data_home, "./") == 0)) {
+	if ((!xtrabackup_print_param) && (!xtrabackup_prepare) && (strcmp(mysql_data_home, "./") == 0)) {
 		if (!xtrabackup_print_param)
 			usage();
 		fprintf(stderr, "\n"