1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upmerge 12379923 (60907)

Browse Source
This commit is contained in:
Bjorn Munch 2011-04-26 10:53:17 +02:00
commit 810e02edf2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/lib/My/SafeProcess/safe_process.pl
View File

@ -94,7 +94,7 @@ eval {
local $SIG{INT}= \&handle_signal; local $SIG{INT}= \&handle_signal;
local $SIG{CHLD}= sub { local $SIG{CHLD}= sub {
message("Got signal @_"); message("Got signal @_");
kill(9, -$child_pid); kill('KILL', -$child_pid);
my $ret= waitpid($child_pid, 0); my $ret= waitpid($child_pid, 0);
if ($? & 127){ if ($? & 127){
exit(65); # Killed by signal exit(65); # Killed by signal
@ -134,7 +134,7 @@ if ( $@ ) {
# Use negative pid in order to kill the whole # Use negative pid in order to kill the whole
# process group # process group
# #
my $ret= kill(9, -$child_pid); my $ret= kill('KILL', -$child_pid);
message("Killed child: $child_pid, ret: $ret"); message("Killed child: $child_pid, ret: $ret");
if ($ret > 0) { if ($ret > 0) {
message("Killed child: $child_pid"); message("Killed child: $child_pid");