bzr commit into mysql-5.1-mtr branch (bjorn.munch:2952) Bug#58424

[Bjorn Munch]

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

 2952 Bjorn Munch	2010-11-24
      Bug #58424 mtr ignores failing mysqltest in the presence of expect file for mysqld
      If mysqltest dies, mtr waits to see if mysqld dies too within 100ms
      But in that case, it should not care about expected crash
      Fix: jump past the code that checks the expect file

    modified:
      mysql-test/mysql-test-run.pl
=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2010-11-05 14:26:38 +0000
+++ b/mysql-test/mysql-test-run.pl	2010-11-24 09:22:03 +0000
@@ -3673,7 +3673,6 @@ sub run_testcase ($) {
     # ----------------------------------------------------
     # Check if it was an expected crash
     # ----------------------------------------------------
-    SRVDIED:
     my $check_crash = check_expected_crash_and_restart($proc);
     if ($check_crash)
     {
@@ -3683,6 +3682,7 @@ sub run_testcase ($) {
       next;
     }
 
+  SRVDIED:
     # ----------------------------------------------------
     # Stop the test case timer
     # ----------------------------------------------------


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