Merge lp:~gl-az/percona-xtrabackup/2.1-bug740489 into lp:percona-xtrabackup/2.1

[George Ormond Lorch III]

Incorporated patch for Bug #740489 : Add --defaults-extra-file param to innobackupex

Added check in innobackupex for presence of defaults-file and defaults-extra-file to print error and exit if both are specified.

Created test case as bug740489.sh.

Modified test/inc/common.sh to set MYSQL_HOME instead of specifying --defaults-file for innobackupex call.

[George Ormond Lorch III (gl-az)]

http://jenkins.percona.com/view/XtraBackup/job/percona-xtrabackup-2.1-param/129/

[Sergei Glushchenko (sergei.glushchenko)]

Approve. Comments are the same as for 2.0 version of patch.

review: Approve (g2)

[Alexey Kopytov (akopytov)]

Same comments as in 2.1 MP.

review: Needs Fixing

[Alexey Kopytov (akopytov)]

review: Approve

=== modified file 'innobackupex'
--- innobackupex	2013-01-02 04:23:18 +0000
+++ innobackupex	2013-01-07 19:19:35 +0000
@@ -96,6 +96,7 @@
 my $option_ibbackup_binary = 'autodetect';
 
 my $option_defaults_file = '';
+my $option_defaults_extra_file = '';
 my $option_incremental = '';
 my $option_incremental_basedir = '';
 my $option_incremental_dir = '';
@@ -812,6 +813,10 @@
         $options = $options . " --defaults-file=\"${backup_dir}/backup-my.cnf\" ";
     }
 
+    if ($option_defaults_extra_file) {
+        $options = $options . " --defaults-extra-file=\"$option_defaults_extra_file\" ";
+    }
+
     if ($option_defaults_group) {
         $options = $options . " --defaults-group=\"$option_defaults_group\" ";
     }
@@ -983,6 +988,10 @@
         $options = $options . " --defaults-file=\"$option_defaults_file\" ";
     }
 
+    if ($option_defaults_extra_file) {
+        $options = $options . " --defaults-extra-file=\"$option_defaults_extra_file\" ";
+    }
+
     if ($option_defaults_group) {
         $options = $options . " --defaults-group=\"$option_defaults_group\" ";
     }
@@ -1070,6 +1079,10 @@
         $options = "$options --defaults-file='$option_defaults_file'";
     }
 
+    if ($option_defaults_extra_file) {
+        $options = $options . " --defaults-extra-file=\"$option_defaults_extra_file\" ";
+    }
+
     if ($option_mysql_password) {
         $options = "$options --password='$option_mysql_password'";
     }
@@ -1732,6 +1745,7 @@
                         'socket=s' => \$option_mysql_socket,
                         'no-timestamp' => \$option_no_timestamp,
                         'defaults-file=s' => \$option_defaults_file,
+                        'defaults-extra-file=s' => \$option_defaults_extra_file,
                         'incremental' => \$option_incremental,
                         'incremental-basedir=s' => \$option_incremental_basedir,
                         'incremental-lsn=s' => \$option_incremental_lsn,
@@ -1764,6 +1778,12 @@
         exit(0);
     }
 
+    if ($option_defaults_file && $option_defaults_extra_file) {
+        print STDERR "$prefix --defaults-file and --defaults-extra-file " .
+            "options are mutually exclusive";
+        exit(1);
+    }
+
     if ($option_copy_back && $option_move_back) {
         print STDERR "$prefix --copy-back and --move-back options are " .
             "mutually exclusive";
@@ -2187,6 +2207,10 @@
         $options = $options . " --defaults-file=\"${backup_dir}/backup-my.cnf\" ";
     }
 
+    if ($option_defaults_extra_file) {
+        $options = $options . " --defaults-extra-file=\"$option_defaults_extra_file\" ";
+    }
+
     if ($option_defaults_group) {
         $options = $options . " --defaults-group=\"$option_defaults_group\" ";
     }
@@ -2706,6 +2730,10 @@
 
 This option specifies what file to read the default MySQL options from.  The option accepts a string argument. It is also passed directly to xtrabackup's --defaults-file option. See the xtrabackup documentation for details.
 
+=item --defaults-extra-file=[MY.CNF]
+
+This option specifies what extra file to read the default MySQL options from before the standard defaults-file.  The option accepts a string argument. It is also passed directly to xtrabackup's --defaults-extra-file option. See the xtrabackup documentation for details.
+
 =item --export
 
 This option is passed directly to xtrabackup's --export option. It enables exporting individual tables for import into another server. See the xtrabackup documentation for details.
 
=== modified file 'test/inc/common.sh'
--- test/inc/common.sh	2012-11-21 12:14:07 +0000
+++ test/inc/common.sh	2013-01-07 19:19:35 +0000
@@ -239,8 +239,9 @@
 	MYSQLD_ARGS="$MYSQLD_ARGS --user=root"
     fi
 
-    IB_ARGS="--defaults-file=${MYSQLD_VARDIR}/my.cnf --user=root \
---socket=${MYSQLD_SOCKET} --ibbackup=$XB_BIN"
+    export MYSQL_HOME=$MYSQLD_VARDIR
+
+    IB_ARGS="--user=root --socket=${MYSQLD_SOCKET} --ibbackup=$XB_BIN"
     XB_ARGS="--no-defaults"
 
     # Some aliases for compatibility, as tests use the following names
 
=== added file 'test/t/bug740489.sh'
--- test/t/bug740489.sh	1970-01-01 00:00:00 +0000
+++ test/t/bug740489.sh	2013-01-07 19:19:35 +0000
@@ -0,0 +1,46 @@
+############################################################################
+# Bug #740489: Add --defaults-extra-file param to innobackupex
+############################################################################
+. inc/common.sh
+
+start_server --innodb_file_per_table
+load_sakila
+
+run_cmd ${MYSQL} ${MYSQL_ARGS} -e "UPDATE mysql.user SET Password=PASSWORD('password') WHERE User='root'; FLUSH PRIVILEGES;"
+
+defaults_extra_file=${TEST_BASEDIR}/740489.cnf
+
+echo "[client]" > $defaults_extra_file
+echo "user=root" >> $defaults_extra_file
+echo "password=password" >> $defaults_extra_file
+
+mkdir -p $topdir/backup
+cat ${MYSQLD_VARDIR}/my.cnf
+run_cmd $IB_BIN --defaults-extra-file=$defaults_extra_file --socket=${MYSQLD_SOCKET} --ibbackup=$XB_BIN $topdir/backup
+backup_dir=`grep "innobackupex: Backup created in directory" $OUTFILE | awk -F\' '{ print $2}'`
+vlog "Backup created in directory $backup_dir"
+
+run_cmd ${MYSQL} ${MYSQL_ARGS} --password=password -e "UPDATE mysql.user SET Password=PASSWORD('') WHERE User='root'; FLUSH PRIVILEGES;"
+
+stop_server
+# Remove datadir
+rm -r $mysql_datadir
+#init_mysql_dir
+# Restore sakila
+vlog "Applying log"
+vlog "###########"
+vlog "# PREPARE #"
+vlog "###########"
+innobackupex --apply-log $backup_dir
+vlog "Restoring MySQL datadir"
+mkdir -p $mysql_datadir
+vlog "###########"
+vlog "# RESTORE #"
+vlog "###########"
+innobackupex --copy-back $backup_dir
+
+start_server
+# Check sakila
+run_cmd ${MYSQL} ${MYSQL_ARGS} --password=password -e "SELECT count(*) from actor" sakila
+
+rm -f $defaults_extra_file