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

[Alexey Kopytov]

http://jenkins.percona.com/job/percona-xtrabackup-2.1-param/511/

[Alexey Kopytov (akopytov)]

review: Approve

=== modified file 'innobackupex.pl'
--- innobackupex.pl	2014-01-03 10:46:10 +0000
+++ innobackupex.pl	2014-01-08 09:52:36 +0000
@@ -965,6 +965,10 @@
       "$home",
    );
 
+   if ($ENV{PTDEBUG_VERSION_CHECK_HOME}) {
+       @vc_dirs = ( $ENV{PTDEBUG_VERSION_CHECK_HOME} );
+   }
+
    sub version_check_file {
       foreach my $dir ( @vc_dirs ) {
          if ( -d $dir && -w $dir ) {
@@ -1564,6 +1568,10 @@
         $now = current_time();
         print STDERR
             "$now  $prefix Executing a version check against the server...\n";
+
+        # Redirect STDOUT to STDERR, as VersionCheck prints alerts to STDOUT
+        select STDERR;
+
         VersionCheck::version_check(
                                     force => 1,
                                     instances => [ {
@@ -1572,6 +1580,9 @@
                                                    }
                                                  ]
                                     );
+        # Restore STDOUT as the default filehandle
+        select STDOUT;
+
         $now = current_time();
         print STDERR "$now  $prefix Done.\n";
     }
 
=== modified file 'test/t/version_check.sh'
--- test/t/version_check.sh	2013-11-07 12:23:43 +0000
+++ test/t/version_check.sh	2014-01-08 09:52:36 +0000
@@ -7,22 +7,14 @@
 
 start_server
 
-# VersionCheck looks for a directory where percona-version-check file is created
-# in the following order:
-#
-#    my @vc_dirs = (
-#    '/etc/percona',
-#    '/etc/percona-toolkit',
-#    '/tmp',
-#    "$home",
-# );
-#
-# Assume that both /etc/percona and /etc/percona-toolkit either do not exist or
-# are not writable. So we'll be testing /tmp/percona-version-check. There's a
-# potential race if there are concurrent tests or other tools using VC, but
-# there's currently no way to avoid that.
-
-rm -f /tmp/percona-version-check
+# Override the directory where percona-version-check is created to make the test
+# stable
+
+export PTDEBUG_VERSION_CHECK_HOME=$topdir
+
+vc_file=$PTDEBUG_VERSION_CHECK_HOME/percona-version-check
+
+[ ! -f $vc_file ] || die "$vc_file exists!"
 
 # VersionCheck is enabled by default, but the test suite adds --no-version-check
 # to IB_ARGS so we don't execute it for all tests.
@@ -30,23 +22,33 @@
 
 innobackupex --no-timestamp $topdir/backup1
 
-if [ -f /tmp/percona-version-check ]
+if [ -f $vc_file ]
 then
-    die "/tmp/percona-version-check has been created with --no-version-check!"
+    die "$vc_file has been created with --no-version-check!"
 fi
 
 IB_ARGS=`echo $IB_ARGS | sed -e 's/--no-version-check//g'`
 
 innobackupex --no-timestamp $topdir/backup2
 
-if [ ! -f /tmp/percona-version-check ]
+if [ ! -f $vc_file ]
 then
-    die "/tmp/percona-version-check has not been created!"
+    die "$vc_file has not been created!"
 fi
 
-rm -f /tmp/percona-version-check
-
 if ! grep -q "Executing a version check" $OUTFILE
 then
     die "Version check has not been performed."
 fi
+
+################################################################################
+# Bug #1256942: xbstream stream mode issues a warning on standard output messing
+#               up the backup stream
+################################################################################
+
+mkdir $topdir/backup3
+
+rm -f $vc_file
+
+innobackupex --no-timestamp --stream=tar $topdir/backup3 | \
+  $TAR -C $topdir/backup3 -xivf -