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

[Alexey Kopytov]

Manual merge from 2.1.

http://jenkins.percona.com/view/PXB 2.2/job/percona-xtrabackup-2.2-param/132/

[Alexey Kopytov (akopytov)]

review: Approve

=== modified file 'storage/innobase/xtrabackup/innobackupex.pl'
--- storage/innobase/xtrabackup/innobackupex.pl	2014-03-24 17:48:44 +0000
+++ storage/innobase/xtrabackup/innobackupex.pl	2014-04-30 09:34:37 +0000
@@ -250,7 +250,7 @@
                             's' => ' ');
 
 # signal that is sent to child processes when they are killed
-my $kill_signal = 15;
+my $kill_signal = 9;
 
 # current local time
 my $now;
@@ -3432,6 +3432,7 @@
             usleep(1);
         }
     }
+
     mysql_query($con, "FLUSH TABLES WITH READ LOCK");
 
     $now = current_time();

=== modified file 'storage/innobase/xtrabackup/src/xtrabackup.cc'
--- storage/innobase/xtrabackup/src/xtrabackup.cc	2014-04-27 11:33:10 +0000
+++ storage/innobase/xtrabackup/src/xtrabackup.cc	2014-04-30 09:34:37 +0000
@@ -5767,7 +5767,7 @@
 	/* Ensure xtrabackup process is killed when the parent one
 	(innobackupex) is terminated with an unhandled signal */
 
-	if (prctl(PR_SET_PDEATHSIG, SIGINT)) {
+	if (prctl(PR_SET_PDEATHSIG, SIGKILL)) {
 		msg("prctl() failed with errno = %d\n", errno);
 		exit(EXIT_FAILURE);
 	}