mirror of
https://github.com/MariaDB/server.git
synced 2025-01-27 17:33:44 +01:00
945fa0d913
mysql-test/t/variables.test: Reset delay_key_write, otherwise maria.maria test may fail sql/set_var.cc: Reset ha_open_options if one resets the delay_key_write variable. Before there was no way to reset it without restarting mysqld, which caused some tests to fail
26 lines
661 B
PHP
26 lines
661 B
PHP
# Include this script after a shutdown to wait until the connection
|
|
# to the server has been lost or timeout occurs.
|
|
# When you change this file you may have to chance its cousin
|
|
# wait_until_connected_again.inc
|
|
|
|
--disable_result_log
|
|
--disable_query_log
|
|
let $counter= 600;
|
|
let $mysql_errno= 0;
|
|
while (!$mysql_errno)
|
|
{
|
|
# 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,2003,2006,2013
|
|
show status;
|
|
|
|
dec $counter;
|
|
if (!$counter)
|
|
{
|
|
--die Server failed to dissapear
|
|
}
|
|
--real_sleep 0.1
|
|
}
|
|
--enable_query_log
|
|
--enable_result_log
|