Merge lp:~sergei.glushchenko/percona-xtrabackup/2.2-xb-bug1239728 into lp:percona-xtrabackup/2.2

[Sergei Glushchenko]

Added synchronization between child thread which supposed to kill queries and parent thread, so parent will not kill child until last finished initialization.

http://jenkins.percona.com/job/percona-xtrabackup-2.2-param/23/

[Alexey Kopytov (akopytov)]

review: Approve

=== modified file 'xtrabackup/innobackupex'
--- xtrabackup/innobackupex	2013-09-26 06:26:18 +0000
+++ xtrabackup/innobackupex	2013-10-22 18:53:17 +0000
@@ -3307,6 +3307,7 @@
         local $SIG{HUP} = sub { $end = 1 };
 
         $pcon->{dbh}->{InactiveDestroy} = 1;
+        kill('USR1', $innobackupex_pid);
 
         sleep($kill_timeout);
 
@@ -3348,9 +3349,15 @@
     $now = current_time();
     print STDERR "$now  $prefix Starting to lock all tables...\n";
 
+    my $query_killer_init = 0;
+
     # start query killer process
     if ($option_kill_long_queries_timeout) {
+        local $SIG{'USR1'} = sub { $query_killer_init = 1 };
         start_query_killer($option_kill_long_queries_timeout, $con);
+        while (!$query_killer_init) {
+            usleep(1);
+        }
     }
     if (compare_versions($mysql_server_version, '4.0.22') == 0
         || compare_versions($mysql_server_version, '4.1.7') == 0) {