database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

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

Browse Source
This commit is contained in:
Magnus Svensson
2008-10-06 19:52:26 +02:00
parent 01a3ac7596
commit 160e13cb4c
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mysql-test/lib/My/SafeProcess.pm
View File

@@ -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";
}