diff options
| author | unknown <msvensson@pilot.mysql.com> | 2008-04-21 14:16:54 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.mysql.com> | 2008-04-21 14:16:54 +0200 |
| commit | 4638c78d357d490ad59f2a212b49758f58feab8b (patch) | |
| tree | f25251316928e83cc1168345bf4edf42ddd3068c /mysql-test/include/restart_mysqld.inc | |
| parent | 13f394b6d613a83986ed6fb3857156b54de528bb (diff) | |
| download | mariadb-git-4638c78d357d490ad59f2a212b49758f58feab8b.tar.gz | |
Add "kill_server", call shutdown on current conneciton and then make sure
the server dissapears
Check return code of 'mysql_ping'
Add "shutdown", call 'mysql_shutdown' on the current connection
mysql-test/include/restart_mysqld.inc:
Use "kill_server"
mysql-test/include/wait_until_connected_again.inc:
Init $mysql_errno to 9999
Add workaround for BUG#36228
Diffstat (limited to 'mysql-test/include/restart_mysqld.inc')
| -rw-r--r-- | mysql-test/include/restart_mysqld.inc | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/mysql-test/include/restart_mysqld.inc b/mysql-test/include/restart_mysqld.inc index 106563d287d..be1693fd300 100644 --- a/mysql-test/include/restart_mysqld.inc +++ b/mysql-test/include/restart_mysqld.inc @@ -1,11 +1,13 @@ # Write file to make mysql-test-run.pl expect crash and restart ---exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect +--write_file $MYSQLTEST_VARDIR/tmp/mysqld.1.expect +restart +EOF ---exec $MYSQLADMIN --defaults-file=$MYSQLTEST_VARDIR/my.cnf --shutdown-timeout=60 shutdown +# Send shutdown to the connected server and give +# it 10 seconds to die before zapping it +kill_server 10; -# Call script that will poll the server waiting for it to be gone ---source include/wait_until_disconnected.inc # Turn on reconnect --enable_reconnect @@ -13,3 +15,6 @@ # Call script that will poll the server waiting for it to be back online again --source include/wait_until_connected_again.inc +# Turn off reconnect again +--disable_reconnect + |