mirror of
https://github.com/MariaDB/server.git
synced 2025-08-31 22:22:30 +03:00
configure.in: Added testing of STRNDUP (not found on solaris) mysql-test/include/wait_until_connected_again.inc: Also test for error 2005 (can happen on windows) mysql-test/include/wait_until_disconnected.inc: Also test for error 2005 (can happen on windows) mysql-test/suite/innodb_plugin/r/innodb_bug30423.result: Number of rows is not stable (found difference on Solaris) mysql-test/suite/innodb_plugin/t/innodb_bug30423.test: Number of rows is not stable (found difference on Solaris) plugin/auth_pam/auth_pam.c: Use internal strndup if it doesn't exist on system (solaris) Changed code so that it should also compile on solaris.
29 lines
694 B
PHP
29 lines
694 B
PHP
#
|
|
# Include this script to wait until the connection to the
|
|
# server has been restored or timeout occurs.
|
|
# You should have done --enable_reconnect first
|
|
# When you change this file you may have to chance its cousin
|
|
# wait_until_disconnected.inc
|
|
|
|
--disable_result_log
|
|
--disable_query_log
|
|
let $counter= 5000;
|
|
let $mysql_errno= 9999;
|
|
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,2005,2006,2013
|
|
show status;
|
|
|
|
dec $counter;
|
|
if (!$counter)
|
|
{
|
|
--die Server failed to restart
|
|
}
|
|
--sleep 0.1
|
|
}
|
|
--enable_query_log
|
|
--enable_result_log
|