Skip to content

Commit

Permalink
MDEV-28648 main.ssl_timeout fails with OpenSSL 3.0.3
Browse files Browse the repository at this point in the history
Depending on OpenSSL version, and at least in 3.0.3, the client-side socket
timeout is reported as generic error (SSL_ERROR_SYSCALL), losing further
details (both errno and GetLastError() return 0). This results in client
reporting "Unknown OpenSSL error" 2026, instead of another generic
"Lost connection to server during query" 2013

Adjusted test case.

Part of MDEV-29000
  • Loading branch information
vaintroub committed Jul 4, 2022
1 parent ef65566 commit 9d5718c
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion mysql-test/main/ssl_timeout.result
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ SELECT (VARIABLE_VALUE <> '') AS have_ssl FROM INFORMATION_SCHEMA.SESSION_STATUS
have_ssl
1
SELECT SLEEP(600);
ERROR HY000: Lost connection to MySQL server during query
Got one of the listed errors
connection default;
disconnect ssl_con;
2 changes: 1 addition & 1 deletion mysql-test/main/ssl_timeout.test
Original file line number Diff line number Diff line change
Expand Up @@ -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';

# --error CR_SERVER_LOST
--error 2013
--error 2013,2026
SELECT SLEEP(600);

connection default;
Expand Down

0 comments on commit 9d5718c

Please sign in to comment.