diff options
Diffstat (limited to 'mysql-test/include/restart_mysqld.inc')
| -rw-r--r-- | mysql-test/include/restart_mysqld.inc | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/mysql-test/include/restart_mysqld.inc b/mysql-test/include/restart_mysqld.inc index ed0fe64a547..940e081c431 100644 --- a/mysql-test/include/restart_mysqld.inc +++ b/mysql-test/include/restart_mysqld.inc @@ -4,6 +4,8 @@ # [--let $allow_rpl_inited= 1] # --source include/restart_mysqld.inc +--source include/not_embedded.inc + if ($rpl_inited) { if (!$allow_rpl_inited) @@ -12,7 +14,7 @@ if ($rpl_inited) } } ---let $server_shutdown_timeout= 10 +--let $server_shutdown_timeout= 60 if ($shutdown_timeout) { --let $server_shutdown_timeout= $shutdown_timeout @@ -29,11 +31,18 @@ if ($shutdown_timeout == 0) --exec echo "wait" > $_expect_file_name # Send shutdown to the connected server and give -# it 10 seconds to die before zapping it +# it an opted number of 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 +if ($restart_parameters) +{ + --exec echo "restart: $restart_parameters" > $_expect_file_name +} +if (!$restart_parameters) +{ + --exec echo "restart" > $_expect_file_name +} # Turn on reconnect --enable_reconnect |