Commit e1fa8cb9 authored by Bjorn Munch's avatar Bjorn Munch

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
parent d718af06
...@@ -3673,7 +3673,6 @@ sub run_testcase ($) { ...@@ -3673,7 +3673,6 @@ sub run_testcase ($) {
# ---------------------------------------------------- # ----------------------------------------------------
# Check if it was an expected crash # Check if it was an expected crash
# ---------------------------------------------------- # ----------------------------------------------------
SRVDIED:
my $check_crash = check_expected_crash_and_restart($proc); my $check_crash = check_expected_crash_and_restart($proc);
if ($check_crash) if ($check_crash)
{ {
...@@ -3683,6 +3682,7 @@ sub run_testcase ($) { ...@@ -3683,6 +3682,7 @@ sub run_testcase ($) {
next; next;
} }
SRVDIED:
# ---------------------------------------------------- # ----------------------------------------------------
# Stop the test case timer # Stop the test case timer
# ---------------------------------------------------- # ----------------------------------------------------
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment