Commit 870699c9 authored by Magnus Svensson's avatar Magnus Svensson
Browse files

WL#4189 Only kill process that hasn't yet finished at end of mtr.pl. Improve debug printout

parent ab5c044e

mysql-test/lib/My/SafeProcess.pm

+4 −2
Original line number Diff line number Diff line
@@ -66,10 +66,12 @@ END { 
  for my $proc (values %running){

    if ( $proc->is_child($$) ){

      #print "Killing: $proc\n";

      if ($proc->wait_one(0)){

	$proc->kill();

      }

    }

  }

}





sub is_child {
@@ -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";

      }