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

fix many rpl test failures

Browse Source 
* wait_until_connected_again.inc should expect ER_CONNECTION_KILLED now
* also fix MySQL BUG#36228
This commit is contained in:
Sergei Golubchik
2016-09-15 15:31:28 +02:00
parent ddc481b0b7
commit b1384143e2
10 changed files with 12 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libmariadb

Submodule libmariadb updated: f95877dc5f...0fa6b16c52

3
mysql-test/extra/rpl_tests/rpl_get_master_version_and_clock.test
View File

@ -61,9 +61,8 @@ connection slave;
# '2003' CR_CONN_HOST_ERROR # '2003' CR_CONN_HOST_ERROR
# '2002' CR_CONNECTION_ERROR # '2002' CR_CONNECTION_ERROR
# '2006' CR_SERVER_GONE_ERROR # '2006' CR_SERVER_GONE_ERROR
# '1040' ER_CON_COUNT_ERROR
# '1053' ER_SERVER_SHUTDOWN # '1053' ER_SERVER_SHUTDOWN
let $slave_io_errno= 1040, 1053, 2002, 2003, 2006, 2013; let $slave_io_errno= 1053, 2002, 2003, 2006, 2013;
--let $slave_io_error_is_nonfatal= 1 --let $slave_io_error_is_nonfatal= 1
source include/wait_for_slave_io_error.inc; source include/wait_for_slave_io_error.inc;

2
mysql-test/include/wait_for_slave_io_error.inc
View File

@ -18,7 +18,7 @@
# $slave_io_errno # $slave_io_errno
# The expected IO error numbers. This can be either a single # The expected IO error numbers. This can be either a single
# number, or a comma-separated list of numbers. Examples: # number, or a comma-separated list of numbers. Examples:
# --let $slave_io_errno= 1040, 1053, 2002, 2003, 2006, 2013 # --let $slave_io_errno= 1053, 2002, 2003, 2006, 2013
# --let $slave_io_errno= 1045 # --let $slave_io_errno= 1045
# (After BUG#41956 has been fixed, this will be required to be # (After BUG#41956 has been fixed, this will be required to be
# symbolic names instead of numbers.) # symbolic names instead of numbers.)

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

@ -11,10 +11,7 @@ let $counter= 5000;
let $mysql_errno= 9999; let $mysql_errno= 9999;
while ($mysql_errno) while ($mysql_errno)
{ {
# Strangely enough, the server might return "Too many connections" --error 0,ER_SERVER_SHUTDOWN,ER_CONNECTION_KILLED,2002,2006,2013
# while being shutdown, thus 1040 is an "allowed" error
# See BUG#36228
--error 0,1040,1053,2002,2003,2005,2006,2013
show status; show status;
dec $counter; dec $counter;

5
mysql-test/include/wait_until_disconnected.inc
View File

@ -9,10 +9,7 @@ let $counter= 600;
let $mysql_errno= 0; let $mysql_errno= 0;
while (!$mysql_errno) while (!$mysql_errno)
{ {
# Strangely enough, the server might return "Too many connections" --error 0,ER_SERVER_SHUTDOWN,ER_CONNECTION_KILLED,2002,2006,2013
# while being shutdown, thus 1040 is an "allowed" error.
# See BUG#36228.
--error 0,1040,1053,2002,2003,2005,2006,2013
show status; show status;
dec $counter; dec $counter;

4
mysql-test/suite/innodb/t/innodb_sys_semaphore_waits.test
View File

@ -77,10 +77,10 @@ let $counter= 80;
let $mysql_errno= 0; let $mysql_errno= 0;
while (!$mysql_errno) while (!$mysql_errno)
{ {
--error 0,1040,1053,2002,2003,2006,2013 --error 0,ER_SERVER_SHUTDOWN,ER_CONNECTION_KILLED,2002,2006,2013
show status; show status;
--error 0,1040,1053,2002,2003,2006,2013 --error 0,ER_SERVER_SHUTDOWN,ER_CONNECTION_KILLED,2002,2006,2013
select * from information_schema.innodb_sys_semaphore_waits; select * from information_schema.innodb_sys_semaphore_waits;
dec $counter; dec $counter;

4
mysql-test/suite/rpl/r/rpl_get_master_version_and_clock.result
View File

@ -12,7 +12,7 @@ include/rpl_stop_server.inc [server_number=1]
slave is unblocked slave is unblocked
SET DEBUG_SYNC='now SIGNAL signal.get_unix_timestamp'; SET DEBUG_SYNC='now SIGNAL signal.get_unix_timestamp';
Check network error happened here Check network error happened here
include/wait_for_slave_io_error.inc [errno=1040, 1053, 2002, 2003, 2006, 2013] include/wait_for_slave_io_error.inc [errno=1053, 2002, 2003, 2006, 2013]
set @@global.debug = "-d,'debug_lock.before_get_UNIX_TIMESTAMP'"; set @@global.debug = "-d,'debug_lock.before_get_UNIX_TIMESTAMP'";
include/rpl_start_server.inc [server_number=1] include/rpl_start_server.inc [server_number=1]
include/wait_for_slave_param.inc [Slave_IO_Running] include/wait_for_slave_param.inc [Slave_IO_Running]
@ -24,7 +24,7 @@ include/rpl_stop_server.inc [server_number=1]
slave is unblocked slave is unblocked
SET DEBUG_SYNC='now SIGNAL signal.get_server_id'; SET DEBUG_SYNC='now SIGNAL signal.get_server_id';
Check network error happened here Check network error happened here
include/wait_for_slave_io_error.inc [errno=1040, 1053, 2002, 2003, 2006, 2013] include/wait_for_slave_io_error.inc [errno=1053, 2002, 2003, 2006, 2013]
set @@global.debug = "-d,'debug_lock.before_get_SERVER_ID'"; set @@global.debug = "-d,'debug_lock.before_get_SERVER_ID'";
include/rpl_start_server.inc [server_number=1] include/rpl_start_server.inc [server_number=1]
include/wait_for_slave_param.inc [Slave_IO_Running] include/wait_for_slave_param.inc [Slave_IO_Running]

2
mysql-test/suite/sys_vars/t/innodb_fatal_semaphore_wait_threshold.test
View File

@ -82,7 +82,7 @@ let $counter= 80;
let $mysql_errno= 0; let $mysql_errno= 0;
while (!$mysql_errno) while (!$mysql_errno)
{ {
--error 0,1040,1053,2002,2003,2006,2013 --error 0,ER_SERVER_SHUTDOWN,ER_CONNECTION_KILLED,2002,2006,2013
show status; show status;
dec $counter; dec $counter;

2
mysql-test/t/ipv4_as_ipv6.test
View File

@ -52,7 +52,7 @@ echo =============Test of '::1' ========================;
let $IPv6= ::1; let $IPv6= ::1;
--echo connect (con1, $IPv6, root, , test, MASTER_MYPORT,); --echo connect (con1, $IPv6, root, , test, MASTER_MYPORT,);
--disable_query_log --disable_query_log
--error 2003,2006 --error 2002,2006
connect (con1, $IPv6, root, , test, $MASTER_MYPORT,); connect (con1, $IPv6, root, , test, $MASTER_MYPORT,);
--enable_query_log --enable_query_log

2
sql/mysqld.cc
View File

@ -6455,7 +6455,7 @@ static void create_new_thread(CONNECT *connect)
mysql_mutex_unlock(&LOCK_connection_count); mysql_mutex_unlock(&LOCK_connection_count);
statistic_increment(denied_connections, &LOCK_status); statistic_increment(denied_connections, &LOCK_status);
statistic_increment(connection_errors_max_connection, &LOCK_status); statistic_increment(connection_errors_max_connection, &LOCK_status);
connect->close_with_error(0, NullS, ER_CON_COUNT_ERROR); connect->close_with_error(0, NullS, abort_loop ? ER_SERVER_SHUTDOWN : ER_CON_COUNT_ERROR);
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
} }