database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-09-02 09:41:40 +03:00
Code Activity

Merge mysql.com:/usr/local/mysql/tmp_merge

Browse Source 
into  mysql.com:/usr/local/mysql/merge-5.1
This commit is contained in:
knielsen@mysql.com
2006-05-18 11:56:50 +02:00
parent 0d069edaa2 c8fd62f3b2
commit a061c90d8a
32 changed files with 1233 additions and 277 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
mysql-test/lib/mtr_process.pl
View File

@@ -20,6 +20,7 @@ sub mtr_record_dead_children ();
sub mtr_exit ($);
sub sleep_until_file_created ($$$);
sub mtr_kill_processes ($);
sub mtr_kill_process ($$$$);
# static in C
sub spawn_impl ($$$$$$$$);
@@ -875,6 +876,25 @@ sub mtr_kill_processes ($) {
}
}
sub mtr_kill_process ($$$$) {
my $pid= shift;
my $signal= shift;
my $retries= shift;
my $timeout= shift;
while (1)
{
kill($signal, $pid);
last unless kill (0, $pid) and $retries--;
mtr_debug("Sleep $timeout second waiting for processes to die");
sleep($timeout);
}
}
##############################################################################
#
# When we exit, we kill off all children