diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-10-31 18:07:02 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-10-31 18:07:02 -0400 |
| commit | 4d1511296288782df0e3d9373396724e250b24c1 (patch) | |
| tree | 9fa47d141b71933859d6c2da585e5bb5e52db212 /mysql-test/include | |
| parent | 17b0b45b1de41a1b188c5de6c3e9d8e6ecc48a72 (diff) | |
| parent | d775ecdd010daad4dc6147fba58acd006bf2c60c (diff) | |
| download | mariadb-git-4d1511296288782df0e3d9373396724e250b24c1.tar.gz | |
Merge tag 'mariadb-10.0.22' into 10.0-galera
Diffstat (limited to 'mysql-test/include')
| -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 |