diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2006-08-17 12:38:30 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2006-08-17 12:38:30 -0400 |
| commit | 548d45a215e36353341a4dda430001b9cc8c0af1 (patch) | |
| tree | 37d52f91b6f8063f9fa6c3fe5c7b3d19aa952ba3 /mysql-test/lib | |
| parent | b8930cbc55e1f054682d070fb615a513e6d086cc (diff) | |
| parent | c7815f2aeb06b4b19b035ebb9690ad060d9796ff (diff) | |
| download | mariadb-git-548d45a215e36353341a4dda430001b9cc8c0af1.tar.gz | |
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1
into zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1-new-maint
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/t/mysql.test:
Auto merged
mysql-test/t/disabled.def:
SCCS merged
Diffstat (limited to 'mysql-test/lib')
| -rw-r--r-- | mysql-test/lib/mtr_process.pl | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mysql-test/lib/mtr_process.pl b/mysql-test/lib/mtr_process.pl index e47b0e4287c..a71a1e7d2e4 100644 --- a/mysql-test/lib/mtr_process.pl +++ b/mysql-test/lib/mtr_process.pl @@ -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 { |