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

[Sergei Glushchenko]

Bug 983685: innodb_data_file_path is not written to backup-my.cnf
Regression introduced by fix for bug #733651.
Along with innodb_data_file_path, innodb_log_group_home_dir is also missed.

[Sergei Glushchenko (sergei.glushchenko)]

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

[Alexey Kopytov (akopytov)]

Approved. But in future, please avoid this ugly hack with grepping the log to figure out backup directory. You can just use --no-timestamp, in which case $topdir/backup will be the backup directory.

review: Approve

=== modified file 'innobackupex'
--- innobackupex	2012-03-27 01:07:43 +0000
+++ innobackupex	2012-04-17 12:48:19 +0000
@@ -1615,6 +1615,7 @@
     }
 
     my @option_names = (
+        "innodb_data_file_path",
         "innodb_log_files_in_group",
         "innodb_log_file_size",
         "innodb_fast_checksum",
@@ -1626,7 +1627,8 @@
           "# The MySQL server\n" .
           "[mysqld]\n" .
           "datadir=$root\n" .
-          "innodb_data_home_dir=$root\n";
+          "innodb_data_home_dir=$root\n" .
+          "innodb_log_group_home_dir=$root\n";
 
     my $option_name;
     foreach $option_name (@option_names) {
 
=== added file 'test/t/bug983685.sh'
--- test/t/bug983685.sh	1970-01-01 00:00:00 +0000
+++ test/t/bug983685.sh	2012-04-17 12:48:19 +0000
@@ -0,0 +1,28 @@
+########################################################################
+# Bug #983685: innodb_data_file_path is not written to backup-my.cnf
+########################################################################
+
+. inc/common.sh
+
+init
+
+options="innodb_data_file_path innodb_log_group_home_dir"
+
+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 ! grep $option $backup_dir/backup-my.cnf ; then
+		vlog "Option $option is absent"
+		exit -1
+	else
+		vlog "Option $option is present"
+	fi
+
+done