From 160e13cb4c6ebecdc341bc2b712f523e2f1c6639 Mon Sep 17 00:00:00 2001
From: Magnus Svensson <msvensson@mysql.com>
Date: Mon, 6 Oct 2008 19:52:26 +0200
Subject: [PATCH]  WL#4189 Only kill process that hasn't yet finished at end of
 mtr.pl. Improve debug printout

---
 mysql-test/lib/My/SafeProcess.pm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/mysql-test/lib/My/SafeProcess.pm b/mysql-test/lib/My/SafeProcess.pm
index 83749514622..f990d889a02 100644
--- a/mysql-test/lib/My/SafeProcess.pm
+++ b/mysql-test/lib/My/SafeProcess.pm
@@ -66,7 +66,9 @@ END {
   for my $proc (values %running){
     if ( $proc->is_child($$) ){
       #print "Killing: $proc\n";
-      $proc->kill();
+      if ($proc->wait_one(0)){
+	$proc->kill();
+      }
     }
   }
 }
@@ -315,7 +317,7 @@ sub start_kill {
     $ret= system($safe_kill, $pid) >> 8;
     if (IS_CYGWIN and $ret == 3)
     {
-      print "safe_process is gone, kickstart the fake process\n";
+      print "safe_process is gone, kickstart the fake process, $self\n";
       if (kill(15, $self->{SAFE_PID}) != 1){
 	print STDERR "Failed to kickstart the fake process\n";
       }