mirror of
https://github.com/MariaDB/server.git
synced 2026-04-17 13:55:32 +02:00
MDEV-30452: ssl error: unexpected EOF while reading
This commit contains fixes for error codes, which are needed because OpenSSL 3.x and recent versions of GnuTLS have changed the indication of error codes when the peer does not send close_notify before closing the connection.
This commit is contained in:
parent
76bcea3154
commit
e3e72644cf
8 changed files with 9 additions and 9 deletions
|
|
@ -84,7 +84,7 @@ SET DEBUG_SYNC = "now SIGNAL continue_kill";
|
|||
--reap
|
||||
|
||||
--connection node_2a
|
||||
--error 0,1213,2013
|
||||
--error 0,1213,2013,2026
|
||||
select * from t1;
|
||||
|
||||
--connection node_2
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ SELECT * FROM t1;
|
|||
SET GLOBAL wsrep_reject_queries = ALL_KILL;
|
||||
|
||||
--connection node_1a
|
||||
--error ER_CONNECTION_KILLED,2013,2006
|
||||
--error ER_CONNECTION_KILLED,2013,2006,2026
|
||||
SELECT * FROM t1;
|
||||
|
||||
--connect node_1b, 127.0.0.1, root, , test, $NODE_MYPORT_1
|
||||
|
|
|
|||
|
|
@ -22,6 +22,6 @@ delete from t1 where a=3;
|
|||
set global innodb_fast_shutdown=0;
|
||||
ERROR 42000: Variable 'innodb_fast_shutdown' can't be set to the value of '0'
|
||||
kill ID;
|
||||
ERROR 70100: Connection was killed
|
||||
Got one of the listed errors
|
||||
# restart
|
||||
drop table t1;
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ let $wait_condition =
|
|||
# depending on platform.
|
||||
#
|
||||
connection con1;
|
||||
-- error 1317, 2006, 2013, ER_CONNECTION_KILLED
|
||||
-- error 1317, 2006, 2013, ER_CONNECTION_KILLED, 2026
|
||||
reap;
|
||||
connection default;
|
||||
DROP TABLE bug51920;
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ set global innodb_fast_shutdown=0;
|
|||
# the error code
|
||||
let $me=`select concat(' ', connection_id())`;
|
||||
replace_result $me ID;
|
||||
error ER_CONNECTION_KILLED;
|
||||
error ER_CONNECTION_KILLED, 2026;
|
||||
eval kill $me;
|
||||
|
||||
source include/start_mysqld.inc;
|
||||
|
|
|
|||
|
|
@ -143,7 +143,7 @@ let $counter= 5000;
|
|||
let $mysql_errno= 9999;
|
||||
while ($mysql_errno)
|
||||
{
|
||||
--error 0,ER_SERVER_SHUTDOWN,ER_CONNECTION_KILLED,2002,2006,2013
|
||||
--error 0,ER_SERVER_SHUTDOWN,ER_CONNECTION_KILLED,2002,2006,2013,2026
|
||||
select 1;
|
||||
|
||||
dec $counter;
|
||||
|
|
|
|||
|
|
@ -146,7 +146,7 @@ COMMIT;
|
|||
|
||||
--echo ## Inserting rows should give error here because connection should ##
|
||||
--echo ## disconnect after using COMMIT ##
|
||||
--Error 2006,2013,ER_QUERY_INTERRUPTED,ER_CONNECTION_KILLED,5014
|
||||
--Error 2006,2013,ER_QUERY_INTERRUPTED,ER_CONNECTION_KILLED,5014,2026
|
||||
INSERT INTO t1 VALUES(4,'Record_4');
|
||||
|
||||
connection test_con2;
|
||||
|
|
@ -160,7 +160,7 @@ INSERT INTO t1 VALUES(12,'Record_12');
|
|||
ROLLBACK;
|
||||
|
||||
--echo ## Expect a failure due to COMMIT/ROLLBACK AND RELEASE behavior ##
|
||||
--Error 2006,2013,ER_QUERY_INTERRUPTED,ER_CONNECTION_KILLED,5014
|
||||
--Error 2006,2013,ER_QUERY_INTERRUPTED,ER_CONNECTION_KILLED,5014,2026
|
||||
INSERT INTO t1 VALUES(4,'Record_4');
|
||||
|
||||
connection default;
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ let $counter= 80;
|
|||
let $mysql_errno= 0;
|
||||
while (!$mysql_errno)
|
||||
{
|
||||
--error 0,ER_SERVER_SHUTDOWN,ER_CONNECTION_KILLED,2002,2006,2013,5014
|
||||
--error 0,ER_SERVER_SHUTDOWN,ER_CONNECTION_KILLED,2002,2006,2013,5014,2026
|
||||
show status;
|
||||
|
||||
dec $counter;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue