diff options
| author | unknown <msvensson@pilot.blaudden> | 2007-04-23 11:03:40 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.blaudden> | 2007-04-23 11:03:40 +0200 |
| commit | 984d8e23d60cd03984afe9f119ad04fe20e4d0e6 (patch) | |
| tree | a49114a87a2f24c83cd14e2f47231eae5d2798c5 /mysql-test/lib/mtr_process.pl | |
| parent | 1f6c9a58fbf1c4851008b9dd706d4fad8ee986db (diff) | |
| parent | d19d4b3f4f24c01f79cd4d281ae351e5a7faa2fa (diff) | |
| download | mariadb-git-984d8e23d60cd03984afe9f119ad04fe20e4d0e6.tar.gz | |
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
mysql-test/lib/mtr_process.pl:
Auto merged
Diffstat (limited to 'mysql-test/lib/mtr_process.pl')
| -rw-r--r-- | mysql-test/lib/mtr_process.pl | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/mysql-test/lib/mtr_process.pl b/mysql-test/lib/mtr_process.pl index 53bf37bcc83..ac2e049a67c 100644 --- a/mysql-test/lib/mtr_process.pl +++ b/mysql-test/lib/mtr_process.pl @@ -1099,6 +1099,13 @@ sub mtr_kill_processes ($) { foreach my $pid (@$pids) { + + if ($pid <= 0) + { + mtr_warning("Trying to kill illegal pid: $pid"); + next; + } + foreach my $sig (15, 9) { last if mtr_im_kill_process([ $pid ], $sig, 10, 1); |