From: Bjorn Munch
Date: November 24 2010 12:51pm
Subject: bzr commit into mysql-5.1-mtr branch (bjorn.munch:2953)
List-Archive: http://lists.mysql.com/commits/124864
Message-Id: <201011241251.oAOCppEh020178@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

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

 2953 Bjorn Munch	2010-11-24 [merge]
      merge 58424

    modified:
      mysql-test/mysql-test-run.pl
=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2010-11-23 13:34:00 +0000
+++ b/mysql-test/mysql-test-run.pl	2010-11-24 12:51:45 +0000
@@ -3677,7 +3677,6 @@ sub run_testcase ($) {
     # ----------------------------------------------------
     # Check if it was an expected crash
     # ----------------------------------------------------
-    SRVDIED:
     my $check_crash = check_expected_crash_and_restart($proc);
     if ($check_crash)
     {
@@ -3687,6 +3686,7 @@ sub run_testcase ($) {
       next;
     }
 
+  SRVDIED:
     # ----------------------------------------------------
     # Stop the test case timer
     # ----------------------------------------------------

No bundle (reason: revision is a merge).