diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-10-09 17:12:26 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-10-09 17:12:26 +0200 |
| commit | cfeedbfd3e292f61c7da8f0a7f86307cbeeddb64 (patch) | |
| tree | 3629d1de148b14915a35a21f809e1a2ea6a08619 /mysql-test/include/restart_mysqld.inc | |
| parent | bff1af983ad7b0bed6c3973e4d13297df5fe2791 (diff) | |
| parent | 16c4b3c68b06653592a9500050ad977a38f4ebae (diff) | |
| download | mariadb-git-cfeedbfd3e292f61c7da8f0a7f86307cbeeddb64.tar.gz | |
Merge branch '5.5' into 10.0
Diffstat (limited to 'mysql-test/include/restart_mysqld.inc')
| -rw-r--r-- | mysql-test/include/restart_mysqld.inc | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/mysql-test/include/restart_mysqld.inc b/mysql-test/include/restart_mysqld.inc index 3d53fada870..71efb141917 100644 --- a/mysql-test/include/restart_mysqld.inc +++ b/mysql-test/include/restart_mysqld.inc @@ -1,3 +1,9 @@ +# ==== Usage ==== +# +# [--let $shutdown_timeout= 30] +# [--let $allow_rpl_inited= 1] +# --source include/restart_mysqld.inc + --source include/not_embedded.inc if ($rpl_inited) @@ -8,6 +14,16 @@ if ($rpl_inited) } } +--let $server_shutdown_timeout= 60 +if ($shutdown_timeout) +{ + --let $server_shutdown_timeout= $shutdown_timeout +} +if ($shutdown_timeout == 0) +{ + --let $server_shutdown_timeout= 0 +} + # Write file to make mysql-test-run.pl expect the "crash", but don't start # it until it's told to --let $_server_id= `SELECT @@server_id` @@ -15,8 +31,8 @@ if ($rpl_inited) --exec echo "wait" > $_expect_file_name # Send shutdown to the connected server and give -# it 60 seconds to die before zapping it -shutdown_server 60; +# it 10 seconds to die before zapping it +shutdown_server $server_shutdown_timeout; # Write file to make mysql-test-run.pl start up the server again --exec echo "restart" > $_expect_file_name |