summaryrefslogtreecommitdiff
path: root/mysql-test/include/restart_mysqld.inc
diff options
context:
space:
mode:
authorunknown <msvensson@pilot.mysql.com>2008-04-14 14:25:57 +0200
committerunknown <msvensson@pilot.mysql.com>2008-04-14 14:25:57 +0200
commit3c565a66b5ec7ac929f4073e14f9e832bfaacabf (patch)
treeb4e815adee35d77db69181b575b31d5437edcafa /mysql-test/include/restart_mysqld.inc
parent4f367b42b5841a528ead36469ca8aa963abbf9a5 (diff)
downloadmariadb-git-3c565a66b5ec7ac929f4073e14f9e832bfaacabf.tar.gz
Set mysqladmin shutdown timeout to 60 seconds
mysql-test/mysql-test-run.pl: Add printout
Diffstat (limited to 'mysql-test/include/restart_mysqld.inc')
-rw-r--r--mysql-test/include/restart_mysqld.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/include/restart_mysqld.inc b/mysql-test/include/restart_mysqld.inc
index 6bd95c80b60..106563d287d 100644
--- a/mysql-test/include/restart_mysqld.inc
+++ b/mysql-test/include/restart_mysqld.inc
@@ -2,7 +2,7 @@
# Write file to make mysql-test-run.pl expect crash and restart
--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
--source include/wait_until_disconnected.inc