From: Bjorn Munch
Date: November 24 2010 9:23am
Subject: bzr commit into mysql-5.1-mtr branch (bjorn.munch:2952) Bug#58424
List-Archive: http://lists.mysql.com/commits/124817
X-Bug: 58424
Message-Id: <201011240924.oAO9O1bA015665@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0626537019=="

--===============0626537019==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#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
     # ----------------------------------------------------


--===============0626537019==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/bjorn.munch@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: bjorn.munch@stripped
# target_branch: file:///home/bm136801/my/mtexp-51/
# testament_sha1: ab0c5e0fdbed43715aff08378dd8ef40a26d1df0
# timestamp: 2010-11-24 10:24:01 +0100
# base_revision_id: bjorn.munch@stripped\
#   jex9j2wov87hzmiq
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWRUGgh4AAY9fgAAQWGf/91ci
GQC////wUAPtu293e8joPWr3NwlEJoIwU8k8TJoExqT09UwmJo2gyjSGaTTRqNQD9UyAaAAaBoMm
qeiDRMo9AT1NNNAAYgMhoJJEaNJtTRppPTRNGQMmQAAAkkCibCn6U09PURpkNA9QBoZATWGr1p9x
e7uCWr4z/UqOVDrFfe7W5j1z01+WCiqfzzT5c8OhS0mTBrn0XUFuQJDcr2GJ/f+WeiI1YaVCQySo
pgm1GisWjFyTRgutolfmed0uwtYDmK4LAbQRlPHlMwpXGE5oqlpLY2JFYlkal9swamTDWDosnCGE
ampFocGQjCOUs+UHlFoRiWdNIzsUM6AQIwhQQrYCHFHfDlFgMnuuFNjzr7xPilaYDFopgdm/oycL
apj/ky0L7sRKKesAWcXCKqEiTCupSETPZeYzKwPGrgL4XNc1Ip1r1XXovlHBs9otAfs1ethWhYnQ
xtpisZDVCAsDL9HMJrbUEJzNXhUU4vB6AL3N0l9RF1fJeQ4tmLy4S3u0FlBNscy5IE75mBXEkcyn
beOa83hcA1kbxk10pG+Qm1BBTqGcoxCjkLzBmrhqXdq4vEXxiycgV3lQWqGies+rF0WGkEIZpTSx
2DQlqIr1gIQghWfqcqo8KmqLy8+nREHRqintgMZ9O+HWLP9L9T0xIZytGsDhineXcodHTNEJNDA6
9s544JuMiCtZdSKcujzecDoI3ENpuFZ8zDOxEW4oc7sh945LMnZD0LTDZjfU5Im4pFjpg4MzM3Bi
za97G2rJXJUqCdQ9Pa4oUmNp5PfEUb97FWnY3yrgBO3vwEa3TqPSwx5QzazmxukIZ6F1JuidfULU
uGVats3iW081X+sJHGCKmmyeCmDX6qMueCqMC32Ta5UVINsPpWTHE56zpofuIzNjvFcVwVMjY3JD
RJdKbhQRgakI2sldBTfxSdITGcS8o9+yLNaRVsFlKEK4B3JTxCfb/rrHWBtTiEfpK77fo1KBxrmM
D28Uivz0F+oXKD8F0wCYTcDzntWJIbGVma6rYYkJMkQ4I++I8Et8SGSGEzWw1ieaIbfVwOSmRjYx
OSHpxuGIXzSZIoDyIOI2GeMUTsmW7dFrmhYCPP2p3wvIvtEGhS1JQTFyO07tnNL/Bd6aqsFZNMTq
PKpYQojcuJneBKxxlr1OesFeTpLNhRBkTXYtdwq64kmtT+ghDNEI5n83RaxWSVkzUtXDIAqD269r
dnQBtFYrGVYMQNAnw4mJ6aDOm2tiLtZGDpXdqvYpmHMiqqvTaRKwtXAM4xyenPMmaQsICybNhUv6
hIhCjLEet8lejDIYLFvFsgs3QOuGStTzX0xA4DLmxj3JFB+C7kinChICoNBDwA==


--===============0626537019==--