mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 12:02:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bug #48367 MTR should react to server dying, rather than to resulting failure of mysqltest

Browse source 
For some reason it usually picks up mysqltest
Wait .1s and then see if a server has died
Change from first commit: label on separate line
This commit is contained in:
Bjorn Munch 2009-11-19 09:58:50 +01:00
parent 052688855e
commit 9ea158edf0
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
mysql-test/mysql-test-run.pl
View file

@ -3495,6 +3495,14 @@ sub run_testcase ($) {
run_on_all($tinfo, "analyze-$analyze");
}
# Wait a bit and see if a server died, if so report that instead
mtr_milli_sleep(100);
my $srvproc= My::SafeProcess::check_any();
if ($srvproc && grep($srvproc eq $_, started(all_servers()))) {
$proc= $srvproc;
goto SRVDIED;
}
# Test case failure reported by mysqltest
report_failure_and_restart($tinfo);
}
@ -3520,6 +3528,7 @@ sub run_testcase ($) {
# ----------------------------------------------------
# Check if it was an expected crash
# ----------------------------------------------------
SRVDIED:
my $check_crash = check_expected_crash_and_restart($proc);
if ($check_crash)
{