mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
Mereg events_restart_phase* to events_restart
BitKeeper/deleted/.del-events_restart_phase2.test: Delete: mysql-test/t/events_restart_phase2.test BitKeeper/deleted/.del-events_restart_phase2-master.opt: Delete: mysql-test/t/events_restart_phase2-master.opt BitKeeper/deleted/.del-events_restart_phase3.test: Delete: mysql-test/t/events_restart_phase3.test BitKeeper/deleted/.del-events_restart_phase3-master.opt: Delete: mysql-test/t/events_restart_phase3-master.opt BitKeeper/deleted/.del-events_restart_phase2.result: Delete: mysql-test/r/events_restart_phase2.result BitKeeper/deleted/.del-events_restart_phase3.result: Delete: mysql-test/r/events_restart_phase3.result mysql-test/include/restart_mysqld.inc: New BitKeeper file ``mysql-test/include/restart_mysqld.inc'' mysql-test/include/wait_until_disconnected.inc: New BitKeeper file ``mysql-test/include/wait_until_disconnected.inc'' mysql-test/t/events_restart-master.opt: New BitKeeper file ``mysql-test/t/events_restart-master.opt''
This commit is contained in:
15
mysql-test/include/restart_mysqld.inc
Normal file
15
mysql-test/include/restart_mysqld.inc
Normal file
@@ -0,0 +1,15 @@
|
||||
|
||||
# Write file to make mysql-test-run.pl expect crash and restart
|
||||
--exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
|
||||
|
||||
--exec $MYSQLADMIN --defaults-file=$MYSQLTEST_VARDIR/my.cnf shutdown
|
||||
|
||||
# Call script that will poll the server waiting for it to be gone
|
||||
--source include/wait_until_disconnected.inc
|
||||
|
||||
# Turn on reconnect
|
||||
--enable_reconnect
|
||||
|
||||
# Call script that will poll the server waiting for it to be back online again
|
||||
--source include/wait_until_connected_again.inc
|
||||
|
21
mysql-test/include/wait_until_disconnected.inc
Normal file
21
mysql-test/include/wait_until_disconnected.inc
Normal file
@@ -0,0 +1,21 @@
|
||||
#
|
||||
# Include this script to wait until the connection to the
|
||||
# server has been dropped
|
||||
--disable_result_log
|
||||
--disable_query_log
|
||||
let $counter= 500;
|
||||
let $mysql_errno= 9999;
|
||||
while (!$mysql_errno)
|
||||
{
|
||||
--error 0,2002,2006
|
||||
show status;
|
||||
|
||||
dec $counter;
|
||||
if (!$counter)
|
||||
{
|
||||
--die Server failed to dissapear
|
||||
}
|
||||
--sleep 0.1
|
||||
}
|
||||
--enable_query_log
|
||||
--enable_result_log
|
Reference in New Issue
Block a user