mirror of
https://github.com/MariaDB/server.git
synced 2025-08-01 03:47:19 +03:00
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
This commit is contained in:
@ -1099,6 +1099,13 @@ sub mtr_kill_processes ($) {
|
|||||||
|
|
||||||
foreach my $pid (@$pids)
|
foreach my $pid (@$pids)
|
||||||
{
|
{
|
||||||
|
|
||||||
|
if ($pid <= 0)
|
||||||
|
{
|
||||||
|
mtr_warning("Trying to kill illegal pid: $pid");
|
||||||
|
next;
|
||||||
|
}
|
||||||
|
|
||||||
foreach my $sig (15, 9)
|
foreach my $sig (15, 9)
|
||||||
{
|
{
|
||||||
last if mtr_im_kill_process([ $pid ], $sig, 10, 1);
|
last if mtr_im_kill_process([ $pid ], $sig, 10, 1);
|
||||||
|
Reference in New Issue
Block a user