upmerge 58424

222dd6e1 · Bjorn Munch · 7427df4a · e1fa8cb9 · 222dd6e1
Commit 222dd6e1 authored Nov 24, 2010 by Bjorn Munch
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

mysql-test/mysql-test-run.pl mysql-test/mysql-test-run.pl +1 -1

No files found.
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -3846,7 +3846,6 @@ sub run_testcase ($) {
    # ----------------------------------------------------
    # Check if it was an expected crash
    # ----------------------------------------------------
-    SRVDIED:
    my $check_crash = check_expected_crash_and_restart($proc);
    if ($check_crash)
    {
@@ -3856,6 +3855,7 @@ sub run_testcase ($) {
      next;
    }

+  SRVDIED:
    # ----------------------------------------------------
    # Stop the test case timer
    # ----------------------------------------------------