Merge lp:~percona-dev/percona-xtrabackup/bugs_787988_732318 into lp:percona-xtrabackup/2.0

[Alexey Kopytov]

[Vadim Tkachenko (vadim-tk)]

OK for me, assuming test passed

review: Approve

=== modified file 'innobackupex'
--- innobackupex	2011-05-20 17:23:07 +0000
+++ innobackupex	2011-05-27 14:01:04 +0000
@@ -265,10 +265,25 @@
 } else {
     # make a backup of InnoDB and MyISAM tables, indexes and .frm files.
     $ibbackup_exit_code = backup();
-    open XTRABACKUP_BINARY, "> $backup_dir/$xtrabackup_binary_file"
-    	or die "Cannot open file $backup_dir/$xtrabackup_binary_file: $!\n";
+    if ($option_remote_host) {
+      open(XTRABACKUP_BINARY,
+	   "| ssh $option_remote_host 'cat > $backup_dir/$xtrabackup_binary_file'")
+	|| die "Failed to open file '$option_remote_host:$backup_dir/$xtrabackup_binary_file': $!";
+    } elsif ($option_stream) {
+      open XTRABACKUP_BINARY, "> $option_tmpdir/$xtrabackup_binary_file"
+    	|| die "Cannot open file $option_tmpdir/$xtrabackup_binary_file: $!\n";
+    } else {
+      open XTRABACKUP_BINARY, "> $backup_dir/$xtrabackup_binary_file"
+    	|| die "Cannot open file $backup_dir/$xtrabackup_binary_file: $!\n";
+    }
     print XTRABACKUP_BINARY $option_ibbackup_binary;
     close XTRABACKUP_BINARY;
+
+    if ($option_stream) {
+      system("cd $option_tmpdir; tar chf - $xtrabackup_binary_file")
+	&& die "Failed to stream $xtrabackup_binary_file: $!";
+      unlink "$option_tmpdir/$xtrabackup_binary_file";
+    }
 }
 
 $now = current_time();