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 zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1

Browse Source 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1-new-maint
This commit is contained in:
cmiller@zippy.cornsilk.net
2006-08-17 12:38:30 -04:00
parent c821fa8bc6 781658d64b
commit e65a3e97b5
26 changed files with 468 additions and 494 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -633,7 +633,7 @@ sub mtr_check_stop_servers ($) {
}
else
{
mtr_verbose("All ports where free, continuing");
mtr_verbose("All ports were free, continuing");
}
}
}
@@ -896,6 +896,7 @@ sub check_expected_crash_and_restart($)
sub mtr_record_dead_children () {
my $process_died= 0;
my $ret_pid;
# Wait without blockinng to see if any processes had died
@@ -904,7 +905,9 @@ sub mtr_record_dead_children () {
{
mtr_warning("mtr_record_dead_children: $ret_pid");
mark_process_dead($ret_pid);
$process_died= 1;
}
return $process_died;
}
sub start_reap_all {