database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Add "kill_server", call shutdown on current conneciton and then make sure

Browse Source 
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
This commit is contained in:
unknown
2008-04-21 14:16:54 +02:00
parent 13f394b6d6
commit 4638c78d35
3 changed files with 141 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
mysql-test/include/restart_mysqld.inc
View File

@ -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

6
mysql-test/include/wait_until_connected_again.inc
View File

@ -4,9 +4,13 @@
--disable_result_log
--disable_query_log
let $counter= 500;
let $mysql_errno= 9999;
while ($mysql_errno)
{
--error 0,1053,2002,2006
# Strangely enough, the server might return "Too many connections"
# while being shutdown, thus 1040 is an "allowed" error
# See BUG#36228
--error 0,1040,1053,2002,2006,2013
show status;
dec $counter;