diff options
| m--------- | libmariadb | 0 | ||||
| -rw-r--r-- | mysql-test/extra/rpl_tests/rpl_get_master_version_and_clock.test | 3 | ||||
| -rw-r--r-- | mysql-test/include/wait_for_slave_io_error.inc | 2 | ||||
| -rw-r--r-- | mysql-test/include/wait_until_connected_again.inc | 5 | ||||
| -rw-r--r-- | mysql-test/include/wait_until_disconnected.inc | 5 | ||||
| -rw-r--r-- | mysql-test/suite/innodb/t/innodb_sys_semaphore_waits.test | 4 | ||||
| -rw-r--r-- | mysql-test/suite/rpl/r/rpl_get_master_version_and_clock.result | 4 | ||||
| -rw-r--r-- | mysql-test/suite/sys_vars/t/innodb_fatal_semaphore_wait_threshold.test | 2 | ||||
| -rw-r--r-- | mysql-test/t/ipv4_as_ipv6.test | 2 | ||||
| -rw-r--r-- | sql/mysqld.cc | 2 |
10 files changed, 11 insertions, 18 deletions
diff --git a/libmariadb b/libmariadb -Subproject f95877dc5f2aed13f31d245e5f0ef1ca11eb949 +Subproject 0fa6b16c525f07b1b4b19da8f0d8790df5f1d1b diff --git a/mysql-test/extra/rpl_tests/rpl_get_master_version_and_clock.test b/mysql-test/extra/rpl_tests/rpl_get_master_version_and_clock.test index 1ef8544884d..eb0e5e21d62 100644 --- a/mysql-test/extra/rpl_tests/rpl_get_master_version_and_clock.test +++ b/mysql-test/extra/rpl_tests/rpl_get_master_version_and_clock.test @@ -61,9 +61,8 @@ connection slave; # '2003' CR_CONN_HOST_ERROR # '2002' CR_CONNECTION_ERROR # '2006' CR_SERVER_GONE_ERROR -# '1040' ER_CON_COUNT_ERROR # '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 source include/wait_for_slave_io_error.inc; diff --git a/mysql-test/include/wait_for_slave_io_error.inc b/mysql-test/include/wait_for_slave_io_error.inc index 4177bf4b858..96844106fa9 100644 --- a/mysql-test/include/wait_for_slave_io_error.inc +++ b/mysql-test/include/wait_for_slave_io_error.inc @@ -18,7 +18,7 @@ # $slave_io_errno # The expected IO error numbers. This can be either a single # 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 # (After BUG#41956 has been fixed, this will be required to be # symbolic names instead of numbers.) diff --git a/mysql-test/include/wait_until_connected_again.inc b/mysql-test/include/wait_until_connected_again.inc index 96240e36db7..bdd99af2fc1 100644 --- a/mysql-test/include/wait_until_connected_again.inc +++ b/mysql-test/include/wait_until_connected_again.inc @@ -11,10 +11,7 @@ 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 + --error 0,ER_SERVER_SHUTDOWN,ER_CONNECTION_KILLED,2002,2006,2013 show status; dec $counter; diff --git a/mysql-test/include/wait_until_disconnected.inc b/mysql-test/include/wait_until_disconnected.inc index 71361682442..15bc6474995 100644 --- a/mysql-test/include/wait_until_disconnected.inc +++ b/mysql-test/include/wait_until_disconnected.inc @@ -9,10 +9,7 @@ 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,2005,2006,2013 + --error 0,ER_SERVER_SHUTDOWN,ER_CONNECTION_KILLED,2002,2006,2013 show status; dec $counter; diff --git a/mysql-test/suite/innodb/t/innodb_sys_semaphore_waits.test b/mysql-test/suite/innodb/t/innodb_sys_semaphore_waits.test index 53d43e6b711..e7acb98b0d0 100644 --- a/mysql-test/suite/innodb/t/innodb_sys_semaphore_waits.test +++ b/mysql-test/suite/innodb/t/innodb_sys_semaphore_waits.test @@ -77,10 +77,10 @@ let $counter= 80; let $mysql_errno= 0; while (!$mysql_errno) { - --error 0,1040,1053,2002,2003,2006,2013 + --error 0,ER_SERVER_SHUTDOWN,ER_CONNECTION_KILLED,2002,2006,2013 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; dec $counter; diff --git a/mysql-test/suite/rpl/r/rpl_get_master_version_and_clock.result b/mysql-test/suite/rpl/r/rpl_get_master_version_and_clock.result index 2997d4eb426..e7f4e566566 100644 --- a/mysql-test/suite/rpl/r/rpl_get_master_version_and_clock.result +++ b/mysql-test/suite/rpl/r/rpl_get_master_version_and_clock.result @@ -12,7 +12,7 @@ include/rpl_stop_server.inc [server_number=1] slave is unblocked SET DEBUG_SYNC='now SIGNAL signal.get_unix_timestamp'; 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'"; include/rpl_start_server.inc [server_number=1] include/wait_for_slave_param.inc [Slave_IO_Running] @@ -24,7 +24,7 @@ include/rpl_stop_server.inc [server_number=1] slave is unblocked SET DEBUG_SYNC='now SIGNAL signal.get_server_id'; 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'"; include/rpl_start_server.inc [server_number=1] include/wait_for_slave_param.inc [Slave_IO_Running] diff --git a/mysql-test/suite/sys_vars/t/innodb_fatal_semaphore_wait_threshold.test b/mysql-test/suite/sys_vars/t/innodb_fatal_semaphore_wait_threshold.test index 3b97a85db01..e9dd0c71936 100644 --- a/mysql-test/suite/sys_vars/t/innodb_fatal_semaphore_wait_threshold.test +++ b/mysql-test/suite/sys_vars/t/innodb_fatal_semaphore_wait_threshold.test @@ -82,7 +82,7 @@ let $counter= 80; let $mysql_errno= 0; while (!$mysql_errno) { - --error 0,1040,1053,2002,2003,2006,2013 + --error 0,ER_SERVER_SHUTDOWN,ER_CONNECTION_KILLED,2002,2006,2013 show status; dec $counter; diff --git a/mysql-test/t/ipv4_as_ipv6.test b/mysql-test/t/ipv4_as_ipv6.test index 1fbc0317a36..2a3ab6647ff 100644 --- a/mysql-test/t/ipv4_as_ipv6.test +++ b/mysql-test/t/ipv4_as_ipv6.test @@ -52,7 +52,7 @@ echo =============Test of '::1' ========================; let $IPv6= ::1; --echo connect (con1, $IPv6, root, , test, MASTER_MYPORT,); --disable_query_log ---error 2003,2006 +--error 2002,2006 connect (con1, $IPv6, root, , test, $MASTER_MYPORT,); --enable_query_log diff --git a/sql/mysqld.cc b/sql/mysqld.cc index fa8f143335d..97b60350e47 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -6455,7 +6455,7 @@ static void create_new_thread(CONNECT *connect) mysql_mutex_unlock(&LOCK_connection_count); statistic_increment(denied_connections, &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; } |