database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Make events_restart more stable by waiting for the server to be stopped before starting it again

Browse Source
This commit is contained in:
Magnus Svensson
2008-08-09 11:16:12 +02:00
parent 02e48e886f
commit 66b42a13f2
4 changed files with 47 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
mysql-test/mysql-test-run.pl
View File

@ -3320,10 +3320,29 @@ sub check_expected_crash_and_restart {
my $expect_file= "$opt_vardir/tmp/".$mysqld->name().".expect";
if ( -f $expect_file )
{
mtr_report("Crash was expected, file '$expect_file' exists");
# Start server with same settings as last time
mysqld_start($mysqld, $mysqld->{'started_opts'});
unlink($expect_file);
mtr_verbose("Crash was expected, file '$expect_file' exists");
while (1){
# If last line in expect file starts with "wait"
# sleep a little and try again, thus allowing the
# test script to control when the server should start
# up again
my $last_line= mtr_lastlinefromfile($expect_file);
if ($last_line =~ /^wait/ )
{
mtr_verbose("Test says wait before restart");
mtr_milli_sleep(100);
next;
}
unlink($expect_file);
# Start server with same settings as last time
mysqld_start($mysqld, $mysqld->{'started_opts'});
last;
}
}
return 1;