diff options
Diffstat (limited to 'mysql-test/include/shutdown_mysqld.inc')
| -rw-r--r-- | mysql-test/include/shutdown_mysqld.inc | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/mysql-test/include/shutdown_mysqld.inc b/mysql-test/include/shutdown_mysqld.inc index e28f3c244ca..c8ab6d00f0d 100644 --- a/mysql-test/include/shutdown_mysqld.inc +++ b/mysql-test/include/shutdown_mysqld.inc @@ -26,6 +26,16 @@ if ($rpl_inited) --let $_expect_file_name= $MYSQLTEST_VARDIR/tmp/mysqld.$_server_id.expect --exec echo "wait" > $_expect_file_name +--let $server_shutdown_timeout= 60 +if ($shutdown_timeout) +{ + --let $server_shutdown_timeout= $shutdown_timeout +} +if ($shutdown_timeout == 0) +{ + --let $server_shutdown_timeout= 0 +} + # Send shutdown to the connected server --shutdown_server $server_shutdown_timeout --source include/wait_until_disconnected.inc |