Merge lp:~sergei.glushchenko/percona-xtrabackup/ST31156-2.1-xb-bug1175860 into lp:percona-xtrabackup/2.1

[Sergei Glushchenko]

Manual merge from 2.0.

[Sergei Glushchenko (sergei.glushchenko)]

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

[George Ormond Lorch III (gl-az)]

review: Approve (g2)

[Alexey Kopytov (akopytov)]

review: Approve

=== modified file 'innobackupex'
--- innobackupex	2013-04-28 18:35:33 +0000
+++ innobackupex	2013-05-03 21:03:49 +0000
@@ -1827,6 +1827,15 @@
             }
         }
 
+        if ( -e "$option_tmpdir/$xtrabackup_pid_file" ) {
+            print STDERR "WARNING : A left over instance of xtrabackup pid " .
+                         "file '$option_tmpdir/$xtrabackup_pid_file' " .
+                         "was found.\n";
+            unlink $option_tmpdir . "/" . $xtrabackup_pid_file || 
+                Die "Failed to delete " .
+                    "'$option_tmpdir/$xtrabackup_pid_file': $!";
+        }
+
     } elsif ($option_copy_back || $option_move_back) {
         #$backup_config_file = $backup_dir . '/backup-my.cnf';
         #read_config_file($backup_config_file, \%backup_config);

=== added file 'test/t/bug1175860.sh'
--- test/t/bug1175860.sh	1970-01-01 00:00:00 +0000
+++ test/t/bug1175860.sh	2013-05-03 21:03:49 +0000
@@ -0,0 +1,14 @@
+############################################################################
+# Bug #1175860: Orphaned xtrabackup_pid file Breaks Cluster SST
+############################################################################
+
+. inc/common.sh
+
+start_server
+
+echo "22993" > $MYSQLD_TMPDIR/xtrabackup_pid
+
+mkdir -p $topdir/backup
+innobackupex --stream=tar $topdir/backup > /dev/null
+
+grep -q "A left over instance of xtrabackup pid file" $OUTFILE