Merge lp:~akopytov/percona-xtrabackup/bug1322658-2.2 into lp:percona-xtrabackup/2.2

[Alexey Kopytov]

Automerge from 2.1.

http://jenkins.percona.com/view/PXB%202.2/job/percona-xtrabackup-2.2-param/174/

[Alexey Kopytov (akopytov)]

review: Approve

=== modified file 'storage/innobase/xtrabackup/innobackupex.pl'
--- storage/innobase/xtrabackup/innobackupex.pl	2014-06-10 13:53:29 +0000
+++ storage/innobase/xtrabackup/innobackupex.pl	2014-07-22 08:59:28 +0000
@@ -19,6 +19,7 @@
 use File::Temp;
 use File::Find;
 use File::Copy;
+use File::Path;
 use English qw(-no_match_vars);
 use Time::HiRes qw(usleep);
 
@@ -2233,6 +2234,16 @@
             file_to_array($isl_path, \@lines);
             $dst_path = $lines[0];
             print STDERR "Using $dst_path as the destination path\n";
+
+            my $dst_dir = File::Basename::dirname($dst_path);
+            if (! -d $dst_dir) {
+                print STDERR "Recursively creating directory $dst_dir\n";
+
+                eval { mkpath($dst_dir) };
+                if ($@) {
+                    die "Could not create directory $dst_dir: $@";
+                }
+            }
         }
     }
 
 
=== modified file 'storage/innobase/xtrabackup/test/t/remote_tablespaces.sh'
--- storage/innobase/xtrabackup/test/t/remote_tablespaces.sh	2013-07-25 15:04:49 +0000
+++ storage/innobase/xtrabackup/test/t/remote_tablespaces.sh	2014-07-22 08:59:28 +0000
@@ -8,7 +8,7 @@
 
 start_server --innodb_file_per_table
 
-remote_dir=$TEST_VAR_ROOT/var1/remote_dir
+remote_dir=$TEST_VAR_ROOT/var1/remote_dir/subdir
 
 $MYSQL $MYSQL_ARGS test <<EOF
 CREATE TABLE t(id INT AUTO_INCREMENT PRIMARY KEY, c INT)
@@ -31,6 +31,7 @@
 stop_server
 
 rm -rf $mysql_datadir/*
+rm -rf $remote_dir
 
 innobackupex --apply-log $topdir/backup
 innobackupex --copy-back $topdir/backup