database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Set mysqladmin shutdown timeout to 60 seconds

Browse Source
This commit is contained in:
msvensson@pilot.mysql.com
2008-04-14 14:25:57 +02:00
parent e549ec7f6a
commit 596aca33f5
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/include/restart_mysqld.inc
View File

@ -2,7 +2,7 @@
# Write file to make mysql-test-run.pl expect crash and restart # Write file to make mysql-test-run.pl expect crash and restart
--exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect --exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
--exec $MYSQLADMIN --defaults-file=$MYSQLTEST_VARDIR/my.cnf shutdown --exec $MYSQLADMIN --defaults-file=$MYSQLTEST_VARDIR/my.cnf --shutdown-timeout=60 shutdown
# Call script that will poll the server waiting for it to be gone # Call script that will poll the server waiting for it to be gone
--source include/wait_until_disconnected.inc --source include/wait_until_disconnected.inc

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

@ -2633,7 +2633,7 @@ sub check_expected_crash_and_restart {
my $expect_file= "$opt_vardir/tmp/".$mysqld->name().".expect"; my $expect_file= "$opt_vardir/tmp/".$mysqld->name().".expect";
if ( -f $expect_file ) if ( -f $expect_file )
{ {
mtr_verbose("Crash was expected, file $expect_file exists"); mtr_report("Crash was expected, file '$expect_file' exists");
# Start server with same settings as last time # Start server with same settings as last time
mysqld_start($mysqld, $mysqld->{'started_opts'}); mysqld_start($mysqld, $mysqld->{'started_opts'});
unlink($expect_file); unlink($expect_file);