From: Bjorn Munch
Date: April 26 2011 8:53am
Subject: bzr commit into mysql-5.5-mtr branch (bjorn.munch:3205)
List-Archive: http://lists.mysql.com/commits/136070
Message-Id: <201104260853.p3Q8rbDY024058@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

#At file:///home/bm136801/my/valgfail-55/ based on revid:bjorn.munch@stripped

 3205 Bjorn Munch	2011-04-26 [merge]
      upmerge 12379923 (60907)

    modified:
      mysql-test/lib/My/SafeProcess/safe_process.pl
=== modified file 'mysql-test/lib/My/SafeProcess/safe_process.pl'
--- a/mysql-test/lib/My/SafeProcess/safe_process.pl	2007-12-20 17:39:33 +0000
+++ b/mysql-test/lib/My/SafeProcess/safe_process.pl	2011-04-20 12:58:53 +0000
@@ -94,7 +94,7 @@ eval {
   local $SIG{INT}=  \&handle_signal;
   local $SIG{CHLD}= sub {
     message("Got signal @_");
-    kill(9, -$child_pid);
+    kill('KILL', -$child_pid);
     my $ret= waitpid($child_pid, 0);
     if ($? & 127){
       exit(65); # Killed by signal
@@ -134,7 +134,7 @@ if ( $@ ) {
 # Use negative pid in order to kill the whole
 # process group
 #
-my $ret= kill(9, -$child_pid);
+my $ret= kill('KILL', -$child_pid);
 message("Killed child: $child_pid, ret: $ret");
 if ($ret > 0) {
   message("Killed child: $child_pid");

No bundle (reason: revision is a merge).