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

[Alexey Kopytov]

[Alexey Kopytov (akopytov)]

http://jenkins.percona.com/view/XtraBackup/job/percona-xtrabackup-2.2-param/12/

[Alexey Kopytov (akopytov)]

Self-approving, trivial change.

review: Approve

=== modified file 'xtrabackup/innobackupex'
--- xtrabackup/innobackupex	2013-09-16 17:23:00 +0000
+++ xtrabackup/innobackupex	2013-09-23 10:52:58 +0000
@@ -251,7 +251,7 @@
 my $src_name;
 my $dst_name;
 my $win = ($^O eq 'MSWin32' ? 1 : 0);
-my $CP_CMD = ($win eq 1 ? "copy /Y" : "cp -p");
+my $CP_CMD = ($win eq 1 ? "copy /Y" : "cp");
 my $xtrabackup_binary_file = 'xtrabackup_binary';
 my $xtrabackup_pid_file = 'xtrabackup_pid';
 my %rsync_files_hash;
 
=== added file 'xtrabackup/test/t/bug943750.sh'
--- xtrabackup/test/t/bug943750.sh	1970-01-01 00:00:00 +0000
+++ xtrabackup/test/t/bug943750.sh	2013-09-23 10:52:58 +0000
@@ -0,0 +1,26 @@
+################################################################################
+# Bug #943750: innobackupex doesn't backup to nfs mount point
+################################################################################
+
+# Create a fake cp that will fail if '-p' is passed by innobackupex
+
+cat >$topdir/cp <<"EOF"
+#!/bin/bash
+
+args=""
+while (( "$#" ))
+do
+    if [ "$1" = "-p" ]
+    then
+        echo "'-p' passed as an argument to 'cp'!"
+        exit 1
+    fi
+    args="$args $1"
+    shift
+done
+/bin/cp $args
+EOF
+
+chmod +x $topdir/cp
+
+PATH=$topdir:$PATH . inc/xb_local.sh