bzr commit into mysql-5.1-mtr branch (Bjorn.Munch:2856) Bug#48367

[Bjorn Munch]

#At file:///home/bm136801/my/srvdies-51/ based on revid:bjorn.munch@stripped

 2856 Bjorn Munch	2009-11-19
      Bug #48367 MTR should react to server dying, rather than to resulting failure of mysqltest
      For some reason it usually picks up mysqltest
      Wait .1s and then see if a server has died
      Change from first commit: label on separate line

    modified:
      mysql-test/mysql-test-run.pl
=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2009-11-16 10:18:16 +0000
+++ b/mysql-test/mysql-test-run.pl	2009-11-19 08:58:50 +0000
@@ -3495,6 +3495,14 @@ sub run_testcase ($) {
 	  run_on_all($tinfo, "analyze-$analyze");
 	}
 
+	# Wait a bit and see if a server died, if so report that instead
+	mtr_milli_sleep(100);
+	my $srvproc= My::SafeProcess::check_any();
+	if ($srvproc && grep($srvproc eq $_, started(all_servers()))) {
+	  $proc= $srvproc;
+	  goto SRVDIED;
+	}
+
 	# Test case failure reported by mysqltest
 	report_failure_and_restart($tinfo);
       }
@@ -3520,6 +3528,7 @@ sub run_testcase ($) {
     # ----------------------------------------------------
     # Check if it was an expected crash
     # ----------------------------------------------------
+    SRVDIED:
     my $check_crash = check_expected_crash_and_restart($proc);
     if ($check_crash)
     {


Attachment: [text/bzr-bundle] bzr/[e-mail]