Commit f1515a9e authored by unknown's avatar unknown

Merge 192.168.0.9:mysql/mysql-5.1-mtr

into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-mtr


mysql-test/mysql-test-run.pl:
  Auto merged
parents 5435b66b 0b23944f
...@@ -2333,9 +2333,16 @@ sub run_testcase ($) { ...@@ -2333,9 +2333,16 @@ sub run_testcase ($) {
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
if ( $opt_start or $opt_start_dirty ) if ( $opt_start or $opt_start_dirty )
{ {
mtr_report("\nServers started, sleeping"); $suite_timeout_proc->kill();
sleep(1) while (1); mtr_report("\nServers started, waiting for any of them to die...");
exit(0); my $proc= My::SafeProcess->wait_any();
if ( grep($proc eq $_, started(all_servers())) )
{
mtr_report("Server $proc died");
exit(1);
}
mtr_report("Unknown process $proc died");
exit(1);
} }
my $test_timeout_proc= My::SafeProcess->timer($opt_testcase_timeout * 60); my $test_timeout_proc= My::SafeProcess->timer($opt_testcase_timeout * 60);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment