diff options
| author | Bjorn Munch <bjorn.munch@oracle.com> | 2010-11-24 10:22:03 +0100 |
|---|---|---|
| committer | Bjorn Munch <bjorn.munch@oracle.com> | 2010-11-24 10:22:03 +0100 |
| commit | a2cbe6e94937d909dcca5bd8f21b06ac09c0862a (patch) | |
| tree | 26e5443279c4125a59156793a33cc039e8e95a46 /mysql-test/mysql-test-run.pl | |
| parent | 32ea070845fd4196ad5d9e5ffc4ce64b736c9869 (diff) | |
| download | mariadb-git-a2cbe6e94937d909dcca5bd8f21b06ac09c0862a.tar.gz | |
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
Diffstat (limited to 'mysql-test/mysql-test-run.pl')
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index b4cd53cff09..775eec7a9ef 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -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 # ---------------------------------------------------- |