Merge lp:~akopytov/percona-xtrabackup/bug1085099-2.1 into lp:percona-xtrabackup/2.1

[Alexey Kopytov]

  Bug #1085099: innobackupex does not pass --tmpdir to xtrabackup

  Make sure innobackupex passes its --tmpdir option to the xtrabackup
  binary.

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

[Sergei Glushchenko (sergei.glushchenko)]

Approve

review: Approve (g2)

=== modified file 'innobackupex'
--- innobackupex	2013-02-04 07:33:56 +0000
+++ innobackupex	2013-03-07 08:20:35 +0000
@@ -845,6 +845,10 @@
         $options = $options . " --incremental-dir=$option_incremental_dir";
     }
 
+    if ($option_tmpdir) {
+        $options .= " --tmpdir=$option_tmpdir";
+    }
+
     # run ibbackup as a child process
     $cmdline = "$option_ibbackup_binary $options";
 
@@ -1019,6 +1023,10 @@
 	$options = $options . " --target-dir=$backup_dir";
     }
 
+    if ($option_tmpdir) {
+        $options .= " --tmpdir=$option_tmpdir";
+    }
+
     # prepare command line for running ibbackup
     if ($option_throttle) {
         $options = $options . " --throttle=$option_throttle";
 
=== added file 'test/t/bug1085099.sh'
--- test/t/bug1085099.sh	1970-01-01 00:00:00 +0000
+++ test/t/bug1085099.sh	2013-03-07 08:20:35 +0000
@@ -0,0 +1,21 @@
+########################################################################
+# Bug #1085099: innobackupex does not pass --tmpdir to xtrabackup
+########################################################################
+
+. inc/common.sh
+
+start_server
+
+$MYSQL $MYSQL_ARGS test <<EOF
+CREATE TABLE t(a INT);
+EOF
+
+# Create a new tmpdir
+mkdir $topdir/new_tmpdir
+
+# Make the default tmpdir inaccessible and make sure permissions are restored on
+# failure
+trap "chmod 755 $MYSQLD_TMPDIR" INT TERM EXIT
+chmod 000 $MYSQLD_TMPDIR
+
+innobackupex --tmpdir=$topdir/new_tmpdir --no-timestamp $topdir/backup