database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

CC 3.1 update

Browse Source 
Test fixes:

Since fix for CONC-603 (wrong error handling in TLS read/write) in case
of a read/write error client doesn't return always error 2013 (server
has gone away), so in addition we need to check for error 2026
(TLS/SSL error) and 5014 (write error).
This commit is contained in:
Georg Richter
2022-07-29 07:40:00 +02:00
committed by Oleksandr Byelkin
parent cbcc0101ee
commit f9315b3321
23 changed files with 57 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libmariadb

Submodule libmariadb updated: d12fd88b6c...7fdb3eab66

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

@ -9,7 +9,7 @@ let $counter= 600;
let $mysql_errno= 0; let $mysql_errno= 0;
while (!$mysql_errno) while (!$mysql_errno)
{ {
--error 0,ER_SERVER_SHUTDOWN,ER_CONNECTION_KILLED,2002,2006,2013 --error 0,ER_SERVER_SHUTDOWN,ER_CONNECTION_KILLED,2002,2006,2026,2013,5014
show status; show status;
dec $counter; dec $counter;

12
mysql-test/main/kill.test
View File

@ -58,7 +58,7 @@ SET DEBUG_SYNC= 'now WAIT_FOR con1_end';
SET DEBUG_SYNC = 'RESET'; SET DEBUG_SYNC = 'RESET';
connection con1; connection con1;
--error 1053,2006,2013 --error 1053,2006,2013,5014
SELECT 1; SELECT 1;
--enable_reconnect --enable_reconnect
@ -97,7 +97,7 @@ SET DEBUG_SYNC= 'now WAIT_FOR con1_end';
SET DEBUG_SYNC = 'RESET'; SET DEBUG_SYNC = 'RESET';
connection con1; connection con1;
--error 1053,2006,2013 --error 1053,2006,2013,5014
SELECT 1; SELECT 1;
enable_reconnect; enable_reconnect;
SELECT 1; SELECT 1;
@ -144,7 +144,7 @@ KILL @id;
SET DEBUG_SYNC= 'now WAIT_FOR con1_end'; SET DEBUG_SYNC= 'now WAIT_FOR con1_end';
connection con1; connection con1;
--error 1317,1053,2006,2013 --error 1317,1053,2006,2013,5014
reap; reap;
SELECT 1; SELECT 1;
@ -289,7 +289,7 @@ SET DEBUG_SYNC= 'now WAIT_FOR con1_end';
connection con1; connection con1;
--echo # ER_SERVER_SHUTDOWN, CR_SERVER_GONE_ERROR, CR_SERVER_LOST, --echo # ER_SERVER_SHUTDOWN, CR_SERVER_GONE_ERROR, CR_SERVER_LOST,
--echo # depending on the timing of close of the connection socket --echo # depending on the timing of close of the connection socket
--error 1053,2006,2013 --error 1053,2006,2013,5014
SELECT 1; SELECT 1;
--enable_reconnect --enable_reconnect
SELECT 1; SELECT 1;
@ -522,10 +522,10 @@ drop user test@localhost;
drop user test2@localhost; drop user test2@localhost;
connection con3; connection con3;
--error 2013,2006 --error 2013,2006,5014
select 1; select 1;
connection con4; connection con4;
--error 2013,2006 --error 2013,2006,5014
select 1; select 1;
connection default; connection default;

14
mysql-test/main/openssl_1.result
View File

@ -47,11 +47,11 @@ disconnect con3;
disconnect con4; disconnect con4;
drop user ssl_user1@localhost, ssl_user3@localhost, ssl_user4@localhost, ssl_user5@localhost; drop user ssl_user1@localhost, ssl_user3@localhost, ssl_user4@localhost, ssl_user5@localhost;
drop table t1; drop table t1;
mysqltest: Could not open connection 'default': 2026 SSL connection error: xxxx mysqltest: Could not open connection 'default': 2026 TLS/SSL error: xxxx
mysqltest: Could not open connection 'default': 2026 SSL connection error: xxxx mysqltest: Could not open connection 'default': 2026 TLS/SSL error: xxxx
mysqltest: Could not open connection 'default': 2026 SSL connection error: xxxx mysqltest: Could not open connection 'default': 2026 TLS/SSL error: xxxx
mysqltest: Could not open connection 'default': 2026 SSL connection error: xxxx mysqltest: Could not open connection 'default': 2026 TLS/SSL error: xxxx
mysqltest: Could not open connection 'default': 2026 SSL connection error: xxxx mysqltest: Could not open connection 'default': 2026 TLS/SSL error: xxxx
have_ssl have_ssl
1 1
End of 5.0 tests End of 5.0 tests
@ -179,7 +179,7 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
mysqldump: Got error: 2026: "SSL connection error: xxxx mysqldump: Got error: 2026: "TLS/SSL error: xxxx
DROP TABLE t1; DROP TABLE t1;
GRANT SELECT ON test.* TO bug42158@localhost REQUIRE X509; GRANT SELECT ON test.* TO bug42158@localhost REQUIRE X509;
FLUSH PRIVILEGES; FLUSH PRIVILEGES;
@ -196,4 +196,4 @@ End of 5.1 tests
/*!40019 SET @@session.max_insert_delayed_threads=0*/; /*!40019 SET @@session.max_insert_delayed_threads=0*/;
/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/; /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
DELIMITER /*!*/; DELIMITER /*!*/;
ERROR: Failed on connect: SSL connection error ERROR: Failed on connect: TLS/SSL error

14
mysql-test/main/openssl_1.test
View File

@ -69,7 +69,7 @@ drop table t1;
# #
--exec echo "this query should not execute;" > $MYSQLTEST_VARDIR/tmp/test.sql --exec echo "this query should not execute;" > $MYSQLTEST_VARDIR/tmp/test.sql
# Handle that openssl gives different error messages from YaSSL. # Handle that openssl gives different error messages from YaSSL.
--replace_regex /2026 SSL connection error.*/2026 SSL connection error: xxxx/ --replace_regex /2026 TLS\/SSL error.*/2026 TLS\/SSL error: xxxx/
--error 1 --error 1
--exec $MYSQL_TEST --ssl-ca=$MYSQL_TEST_DIR/std_data/untrusted-cacert.pem --max-connect-retries=1 < $MYSQLTEST_VARDIR/tmp/test.sql 2>&1 --exec $MYSQL_TEST --ssl-ca=$MYSQL_TEST_DIR/std_data/untrusted-cacert.pem --max-connect-retries=1 < $MYSQLTEST_VARDIR/tmp/test.sql 2>&1
--echo --echo
@ -78,7 +78,7 @@ drop table t1;
# Test that we can't open connection to server if we are using # Test that we can't open connection to server if we are using
# a blank ca # a blank ca
# #
--replace_regex /2026 SSL connection error.*/2026 SSL connection error: xxxx/ --replace_regex /2026 TLS\/SSL error.*/2026 TLS\/SSL error: xxxx/
--error 1 --error 1
--exec $MYSQL_TEST --ssl-ca= --max-connect-retries=1 < $MYSQLTEST_VARDIR/tmp/test.sql 2>&1 --exec $MYSQL_TEST --ssl-ca= --max-connect-retries=1 < $MYSQLTEST_VARDIR/tmp/test.sql 2>&1
--echo --echo
@ -87,7 +87,7 @@ drop table t1;
# Test that we can't open connection to server if we are using # Test that we can't open connection to server if we are using
# a nonexistent ca file # a nonexistent ca file
# #
--replace_regex /2026 SSL connection error.*/2026 SSL connection error: xxxx/ --replace_regex /2026 TLS\/SSL error.*/2026 TLS\/SSL error: xxxx/
--error 1 --error 1
--exec $MYSQL_TEST --ssl-ca=nonexisting_file.pem --max-connect-retries=1 < $MYSQLTEST_VARDIR/tmp/test.sql 2>&1 --exec $MYSQL_TEST --ssl-ca=nonexisting_file.pem --max-connect-retries=1 < $MYSQLTEST_VARDIR/tmp/test.sql 2>&1
--echo --echo
@ -96,7 +96,7 @@ drop table t1;
# Test that we can't open connection to server if we are using # Test that we can't open connection to server if we are using
# a blank client-key # a blank client-key
# #
--replace_regex /2026 SSL connection error.*/2026 SSL connection error: xxxx/ --replace_regex /2026 TLS\/SSL error.*/2026 TLS\/SSL error: xxxx/
--error 1 --error 1
--exec $MYSQL_TEST --ssl-key= --max-connect-retries=1 < $MYSQLTEST_VARDIR/tmp/test.sql 2>&1 --exec $MYSQL_TEST --ssl-key= --max-connect-retries=1 < $MYSQLTEST_VARDIR/tmp/test.sql 2>&1
--echo --echo
@ -105,7 +105,7 @@ drop table t1;
# Test that we can't open connection to server if we are using # Test that we can't open connection to server if we are using
# a blank client-cert # a blank client-cert
# #
--replace_regex /2026 SSL connection error.*/2026 SSL connection error: xxxx/ --replace_regex /2026 TLS\/SSL error.*/2026 TLS\/SSL error: xxxx/
--error 1 --error 1
--exec $MYSQL_TEST --ssl-cert= --max-connect-retries=1 < $MYSQLTEST_VARDIR/tmp/test.sql 2>&1 --exec $MYSQL_TEST --ssl-cert= --max-connect-retries=1 < $MYSQLTEST_VARDIR/tmp/test.sql 2>&1
--echo --echo
@ -174,7 +174,7 @@ INSERT INTO t1 VALUES (1), (2);
# With wrong parameters # With wrong parameters
--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR mysqldump.exe mysqldump --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR mysqldump.exe mysqldump
--replace_regex /SSL connection error.*/SSL connection error: xxxx/ --replace_regex /TLS\/SSL error.*/TLS\/SSL error: xxxx/
--error 2 --error 2
--exec $MYSQL_DUMP --default-character-set=utf8mb4 --skip-create-options --skip-comments --ssl --ssl-cert=$MYSQL_TEST_DIR/std_data/client-cert.pem test 2>&1 --exec $MYSQL_DUMP --default-character-set=utf8mb4 --skip-create-options --skip-comments --ssl --ssl-cert=$MYSQL_TEST_DIR/std_data/client-cert.pem test 2>&1
--echo --echo
@ -200,7 +200,7 @@ set global sql_mode=default;
# MDEV-9605 mysqlbinlog does not accept ssl-ca option as expected. # MDEV-9605 mysqlbinlog does not accept ssl-ca option as expected.
# #
--replace_regex /SSL connection error:.*/SSL connection error/ --replace_regex /TLS\/SSL error:.*/TLS\/SSL error/
--error 1 --error 1
--exec $MYSQL_BINLOG --read-from-remote-server --ssl-ca --user=root --host=localhost nobinlog.111111 2>&1 --exec $MYSQL_BINLOG --read-from-remote-server --ssl-ca --user=root --host=localhost nobinlog.111111 2>&1

12
mysql-test/main/openssl_6975,tlsv10.result
View File

@ -3,14 +3,14 @@ grant select on test.* to ssl_sslv3@localhost require cipher "AES128-SHA";
create user ssl_tls12@localhost; create user ssl_tls12@localhost;
grant select on test.* to ssl_tls12@localhost require cipher "AES128-SHA256"; grant select on test.* to ssl_tls12@localhost require cipher "AES128-SHA256";
TLS1.2 ciphers: user is ok with any cipher TLS1.2 ciphers: user is ok with any cipher
ERROR 2026 (HY000): SSL connection error: sslv3 alert handshake failure ERROR 2026 (HY000): TLS/SSL error: sslv3 alert handshake failure
ERROR 2026 (HY000): SSL connection error: sslv3 alert handshake failure ERROR 2026 (HY000): TLS/SSL error: sslv3 alert handshake failure
TLS1.2 ciphers: user requires SSLv3 cipher AES128-SHA TLS1.2 ciphers: user requires SSLv3 cipher AES128-SHA
ERROR 2026 (HY000): SSL connection error: sslv3 alert handshake failure ERROR 2026 (HY000): TLS/SSL error: sslv3 alert handshake failure
ERROR 2026 (HY000): SSL connection error: sslv3 alert handshake failure ERROR 2026 (HY000): TLS/SSL error: sslv3 alert handshake failure
TLS1.2 ciphers: user requires TLSv1.2 cipher AES128-SHA256 TLS1.2 ciphers: user requires TLSv1.2 cipher AES128-SHA256
ERROR 2026 (HY000): SSL connection error: sslv3 alert handshake failure ERROR 2026 (HY000): TLS/SSL error: sslv3 alert handshake failure
ERROR 2026 (HY000): SSL connection error: sslv3 alert handshake failure ERROR 2026 (HY000): TLS/SSL error: sslv3 alert handshake failure
SSLv3 ciphers: user is ok with any cipher SSLv3 ciphers: user is ok with any cipher
Variable_name Value Variable_name Value
Ssl_cipher AES256-SHA Ssl_cipher AES256-SHA

12
mysql-test/main/openssl_6975,tlsv12.result
View File

@ -15,13 +15,13 @@ Variable_name Value
Ssl_cipher AES128-SHA256 Ssl_cipher AES128-SHA256
ERROR 1045 (28000): Access denied for user 'ssl_tls12'@'localhost' (using password: NO) ERROR 1045 (28000): Access denied for user 'ssl_tls12'@'localhost' (using password: NO)
SSLv3 ciphers: user is ok with any cipher SSLv3 ciphers: user is ok with any cipher
ERROR 2026 (HY000): SSL connection error: sslv3 alert handshake failure ERROR 2026 (HY000): TLS/SSL error: sslv3 alert handshake failure
ERROR 2026 (HY000): SSL connection error: sslv3 alert handshake failure ERROR 2026 (HY000): TLS/SSL error: sslv3 alert handshake failure
SSLv3 ciphers: user requires SSLv3 cipher AES128-SHA SSLv3 ciphers: user requires SSLv3 cipher AES128-SHA
ERROR 2026 (HY000): SSL connection error: sslv3 alert handshake failure ERROR 2026 (HY000): TLS/SSL error: sslv3 alert handshake failure
ERROR 2026 (HY000): SSL connection error: sslv3 alert handshake failure ERROR 2026 (HY000): TLS/SSL error: sslv3 alert handshake failure
SSLv3 ciphers: user requires TLSv1.2 cipher AES128-SHA256 SSLv3 ciphers: user requires TLSv1.2 cipher AES128-SHA256
ERROR 2026 (HY000): SSL connection error: sslv3 alert handshake failure ERROR 2026 (HY000): TLS/SSL error: sslv3 alert handshake failure
ERROR 2026 (HY000): SSL connection error: sslv3 alert handshake failure ERROR 2026 (HY000): TLS/SSL error: sslv3 alert handshake failure
drop user ssl_sslv3@localhost; drop user ssl_sslv3@localhost;
drop user ssl_tls12@localhost; drop user ssl_tls12@localhost;

4
mysql-test/main/ssl_7937,nossl.result
View File

@ -9,7 +9,7 @@ mysql --ssl -e "call test.have_ssl()"
have_ssl have_ssl
no no
mysql --ssl-ca=cacert.pem --ssl-verify-server-cert -e "call test.have_ssl()" mysql --ssl-ca=cacert.pem --ssl-verify-server-cert -e "call test.have_ssl()"
ERROR 2026 (HY000): SSL connection error: SSL is required, but the server does not support it ERROR 2026 (HY000): TLS/SSL error: SSL is required, but the server does not support it
mysql --ssl --ssl-verify-server-cert -e "call test.have_ssl()" mysql --ssl --ssl-verify-server-cert -e "call test.have_ssl()"
ERROR 2026 (HY000): SSL connection error: SSL is required, but the server does not support it ERROR 2026 (HY000): TLS/SSL error: SSL is required, but the server does not support it
drop procedure have_ssl; drop procedure have_ssl;

2
mysql-test/main/ssl_7937.result
View File

@ -12,5 +12,5 @@ mysql --ssl-ca=cacert.pem --ssl-verify-server-cert -e "call test.have_ssl()"
have_ssl have_ssl
yes yes
mysql --ssl --ssl-verify-server-cert -e "call test.have_ssl()" mysql --ssl --ssl-verify-server-cert -e "call test.have_ssl()"
ERROR 2026 (HY000): SSL connection error: Failed to verify the server certificate ERROR 2026 (HY000): TLS/SSL error: Failed to verify the server certificate
drop procedure have_ssl; drop procedure have_ssl;

2
mysql-test/main/ssl_7937.test
View File

@ -21,6 +21,6 @@ create procedure have_ssl()
--exec $MYSQL --ssl-ca=$MYSQL_TEST_DIR/std_data/cacert.pem --ssl-verify-server-cert -e "call test.have_ssl()" 2>&1 --exec $MYSQL --ssl-ca=$MYSQL_TEST_DIR/std_data/cacert.pem --ssl-verify-server-cert -e "call test.have_ssl()" 2>&1
--echo mysql --ssl --ssl-verify-server-cert -e "call test.have_ssl()" --echo mysql --ssl --ssl-verify-server-cert -e "call test.have_ssl()"
--replace_regex /SSL connection error.*certificate[^\n]*/SSL connection error: Failed to verify the server certificate/ --replace_regex /TLS\/SSL error.*certificate[^\n]*/TLS\/SSL error: Failed to verify the server certificate/
--exec $MYSQL --ssl --ssl-verify-server-cert -e "call test.have_ssl()" 2>&1 --exec $MYSQL --ssl --ssl-verify-server-cert -e "call test.have_ssl()" 2>&1
drop procedure have_ssl; drop procedure have_ssl;

2
mysql-test/main/ssl_ca.result
View File

@ -2,7 +2,7 @@
# Bug#21920657: SSL-CA FAILS SILENTLY IF THE PATH CANNOT BE FOUND # Bug#21920657: SSL-CA FAILS SILENTLY IF THE PATH CANNOT BE FOUND
# #
# try to connect with wrong '--ssl-ca' path : should fail # try to connect with wrong '--ssl-ca' path : should fail
ERROR 2026 (HY000): SSL connection error: xxxx ERROR 2026 (HY000): TLS/SSL error: xxxx
# try to connect with correct '--ssl-ca' path : should connect # try to connect with correct '--ssl-ca' path : should connect
have_ssl have_ssl
1 1

2
mysql-test/main/ssl_ca.test
View File

@ -7,7 +7,7 @@
--echo # try to connect with wrong '--ssl-ca' path : should fail --echo # try to connect with wrong '--ssl-ca' path : should fail
--replace_regex /SSL connection error.*/SSL connection error: xxxx/ --replace_regex /TLS\/SSL error.*/TLS\/SSL error: xxxx/
--error 1 --error 1
--exec $MYSQL --ssl-ca=$MYSQL_TEST_DIR/std_data/wrong-cacert.pem --ssl-key=$MYSQL_TEST_DIR/std_data/client-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/client-cert.pem test -e "SELECT (VARIABLE_VALUE <> '') AS have_ssl FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME='Ssl_cipher';" 2>&1 --exec $MYSQL --ssl-ca=$MYSQL_TEST_DIR/std_data/wrong-cacert.pem --ssl-key=$MYSQL_TEST_DIR/std_data/client-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/client-cert.pem test -e "SELECT (VARIABLE_VALUE <> '') AS have_ssl FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME='Ssl_cipher';" 2>&1
--echo --echo

2
mysql-test/main/ssl_cipher.result
View File

@ -44,7 +44,7 @@ Ssl_cipher AES128-SHA
SHOW STATUS LIKE 'Ssl_cipher'; SHOW STATUS LIKE 'Ssl_cipher';
Variable_name Value Variable_name Value
Ssl_cipher AES128-SHA Ssl_cipher AES128-SHA
mysqltest: Could not open connection 'default': 2026 SSL connection error: xxxxVariable_name Value mysqltest: Could not open connection 'default': 2026 TLS/SSL error: xxxxVariable_name Value
Ssl_cipher AES256-SHA Ssl_cipher AES256-SHA
Variable_name Value Variable_name Value
Ssl_cipher AES128-SHA Ssl_cipher AES128-SHA

2
mysql-test/main/ssl_cipher.test
View File

@ -54,7 +54,7 @@ EOF
# Test to connect using a specifi cipher # Test to connect using a specifi cipher
--exec $MYSQL_TEST --ssl-cipher=AES128-SHA < $MYSQLTEST_VARDIR/tmp/test.sql 2>&1 --exec $MYSQL_TEST --ssl-cipher=AES128-SHA < $MYSQLTEST_VARDIR/tmp/test.sql 2>&1
# Test to connect using an unknown cipher # Test to connect using an unknown cipher
--replace_regex /2026 SSL connection error.*/2026 SSL connection error: xxxx/ --replace_regex /2026 TLS\/SSL error.*/2026 TLS\/SSL error: xxxx/
--error 1 --error 1
--exec $MYSQL_TEST --ssl-cipher=UNKNOWN-CIPHER < $MYSQLTEST_VARDIR/tmp/test.sql 2>&1 --exec $MYSQL_TEST --ssl-cipher=UNKNOWN-CIPHER < $MYSQLTEST_VARDIR/tmp/test.sql 2>&1
--remove_file $MYSQLTEST_VARDIR/tmp/test.sql --remove_file $MYSQLTEST_VARDIR/tmp/test.sql

2
mysql-test/main/ssl_crl.result
View File

@ -2,4 +2,4 @@
Variable_name Value Variable_name Value
Ssl_version TLS_VERSION Ssl_version TLS_VERSION
# try logging in with a certificate in the server's --ssl-crl : should fail # try logging in with a certificate in the server's --ssl-crl : should fail
ERROR 2026 (HY000): SSL connection error: sslv3 alert certificate revoked ERROR 2026 (HY000): TLS/SSL error: sslv3 alert certificate revoked

2
mysql-test/main/ssl_crl.test
View File

@ -8,6 +8,6 @@
--echo # try logging in with a certificate in the server's --ssl-crl : should fail --echo # try logging in with a certificate in the server's --ssl-crl : should fail
# OpenSSL 1.1.1a correctly rejects the certificate, but the error message is different # OpenSSL 1.1.1a correctly rejects the certificate, but the error message is different
--replace_regex /ERROR 2013 \(HY000\): Lost connection to MySQL server at '.*', system error: [0-9]+/ERROR 2026 (HY000): SSL connection error: sslv3 alert certificate revoked/ --replace_regex /ERROR 2013 \(HY000\): Lost connection to MySQL server at '.*', system error: [0-9]+/ERROR 2026 (HY000): TLS\/SSL error: sslv3 alert certificate revoked/
--error 1 --error 1
--exec $MYSQL --ssl-ca=$MYSQL_TEST_DIR/std_data/cacert.pem --ssl-key=$MYSQL_TEST_DIR/std_data/client-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/client-cert.pem test -e "SHOW STATUS LIKE 'Ssl_version'" 2>&1 --exec $MYSQL --ssl-ca=$MYSQL_TEST_DIR/std_data/cacert.pem --ssl-key=$MYSQL_TEST_DIR/std_data/client-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/client-cert.pem test -e "SHOW STATUS LIKE 'Ssl_version'" 2>&1

8
mysql-test/main/ssl_crl_clients.result
View File

@ -1,13 +1,13 @@
# Test clients with and without CRL lists # Test clients with and without CRL lists
############ Test mysql ############## ############ Test mysql ##############
# Test mysql connecting to a server with a certificate revoked by -crl # Test mysql connecting to a server with a certificate revoked by -crl
ERROR 2026 (HY000): SSL connection error: certificate revoked ERROR 2026 (HY000): TLS/SSL error: certificate revoked
# Test mysql connecting to a server with a certificate revoked by -crlpath # Test mysql connecting to a server with a certificate revoked by -crlpath
ERROR 2026 (HY000): SSL connection error: certificate revoked ERROR 2026 (HY000): TLS/SSL error: certificate revoked
############ Test mysqladmin ############## ############ Test mysqladmin ##############
# Test mysqladmin connecting to a server with a certificate revoked by -crl # Test mysqladmin connecting to a server with a certificate revoked by -crl
mysqladmin: connect to server at 'localhost' failed mysqladmin: connect to server at 'localhost' failed
error: 'SSL connection error: certificate revoked' error: 'TLS/SSL error: certificate revoked'
# Test mysqladmin connecting to a server with a certificate revoked by -crlpath # Test mysqladmin connecting to a server with a certificate revoked by -crlpath
mysqladmin: connect to server at 'localhost' failed mysqladmin: connect to server at 'localhost' failed
error: 'SSL connection error: certificate revoked' error: 'TLS/SSL error: certificate revoked'

4
mysql-test/main/ssl_crl_clients.test
View File

@ -34,11 +34,11 @@ copy_file $MYSQL_TEST_DIR/std_data/server-cert.crl $MYSQL_TMP_DIR/ed1f42db.r0;
let $admin_suffix = --default-character-set=latin1 -S $MASTER_MYSOCK -P $MASTER_MYPORT -u root --password= ping; let $admin_suffix = --default-character-set=latin1 -S $MASTER_MYSOCK -P $MASTER_MYPORT -u root --password= ping;
--echo # Test mysqladmin connecting to a server with a certificate revoked by -crl --echo # Test mysqladmin connecting to a server with a certificate revoked by -crl
--replace_regex /.*mysqladmin.*:/mysqladmin:/ /SSL connection error: .*CRYPT_E_REVOKED./SSL connection error: certificate revoked/ --replace_regex /.*mysqladmin.*:/mysqladmin:/ /TLS\/SSL error: .*CRYPT_E_REVOKED./TLS\/SSL error: certificate revoked/
--error 1 --error 1
--exec $MYSQLADMIN $ssl_crl $admin_suffix 2>&1 --exec $MYSQLADMIN $ssl_crl $admin_suffix 2>&1
--echo # Test mysqladmin connecting to a server with a certificate revoked by -crlpath --echo # Test mysqladmin connecting to a server with a certificate revoked by -crlpath
--replace_regex /.*mysqladmin.*:/mysqladmin:/ /SSL connection error: .*CRYPT_E_REVOKED./SSL connection error: certificate revoked/ --replace_regex /.*mysqladmin.*:/mysqladmin:/ /TLS\/SSL error: .*CRYPT_E_REVOKED./TLS\/SSL error: certificate revoked/
--error 1 --error 1
--exec $MYSQLADMIN $ssl_crlpath $admin_suffix 2>&1 --exec $MYSQLADMIN $ssl_crlpath $admin_suffix 2>&1

2
mysql-test/main/ssl_system_ca,bad.result
View File

@ -1 +1 @@
ERROR 2026 (HY000): SSL connection error: Validation of SSL server certificate failed ERROR 2026 (HY000): TLS/SSL error: Validation of SSL server certificate failed

2
mysql-test/main/ssl_timeout.result
View File

@ -5,6 +5,6 @@ SELECT (VARIABLE_VALUE <> '') AS have_ssl FROM INFORMATION_SCHEMA.SESSION_STATUS
have_ssl have_ssl
1 1
SELECT SLEEP(600); SELECT SLEEP(600);
ERROR HY000: Lost connection to MySQL server during query Got one of the listed errors
connection default; connection default;
disconnect ssl_con; disconnect ssl_con;

2
mysql-test/main/ssl_timeout.test
View File

@ -10,7 +10,7 @@ connect (ssl_con,localhost,root,,,,,SSL read_timeout=5);
SELECT (VARIABLE_VALUE <> '') AS have_ssl FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME='Ssl_cipher'; SELECT (VARIABLE_VALUE <> '') AS have_ssl FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME='Ssl_cipher';
# --error CR_SERVER_LOST # --error CR_SERVER_LOST
--error 2013 --error 2013,2026
SELECT SLEEP(600); SELECT SLEEP(600);
connection default; connection default;

4
mysql-test/main/wait_timeout.test
View File

@ -61,7 +61,7 @@ connection default;
# When the connection is closed in this way, the error code should # When the connection is closed in this way, the error code should
# be consistent see Bug#2845 for an explanation # be consistent see Bug#2845 for an explanation
# depending on platform/client, either errno 2006 or 2013 can occur below # depending on platform/client, either errno 2006 or 2013 can occur below
--error 2006,2013 --error 2006,2013,5014
SELECT 2; SELECT 2;
--echo --enable_reconnect; --echo --enable_reconnect;
--enable_reconnect --enable_reconnect
@ -113,7 +113,7 @@ connection con1;
# When the connection is closed in this way, the error code should # When the connection is closed in this way, the error code should
# be consistent see Bug#2845 for an explanation # be consistent see Bug#2845 for an explanation
# depending on platform/client, either errno 2006 or 2013 can occur below # depending on platform/client, either errno 2006 or 2013 can occur below
--error 2006,2013 --error 2006,2013,5014
SELECT 2; SELECT 2;
--echo --enable_reconnect; --echo --enable_reconnect;
--enable_reconnect --enable_reconnect

4
mysql-test/suite/sys_vars/t/completion_type_func.test
View File

@ -146,7 +146,7 @@ COMMIT;
--echo ## Inserting rows should give error here because connection should ## --echo ## Inserting rows should give error here because connection should ##
--echo ## disconnect after using COMMIT ## --echo ## disconnect after using COMMIT ##
--Error 2006,2013,ER_QUERY_INTERRUPTED,ER_CONNECTION_KILLED --Error 2006,2013,ER_QUERY_INTERRUPTED,ER_CONNECTION_KILLED,5014
INSERT INTO t1 VALUES(4,'Record_4'); INSERT INTO t1 VALUES(4,'Record_4');
connection test_con2; connection test_con2;
@ -160,7 +160,7 @@ INSERT INTO t1 VALUES(12,'Record_12');
ROLLBACK; ROLLBACK;
--echo ## Expect a failure due to COMMIT/ROLLBACK AND RELEASE behavior ## --echo ## Expect a failure due to COMMIT/ROLLBACK AND RELEASE behavior ##
--Error 2006,2013,ER_QUERY_INTERRUPTED,ER_CONNECTION_KILLED --Error 2006,2013,ER_QUERY_INTERRUPTED,ER_CONNECTION_KILLED,5014
INSERT INTO t1 VALUES(4,'Record_4'); INSERT INTO t1 VALUES(4,'Record_4');
connection default; connection default;