revision-id: abde8dcc4fd4fa551cead438affa70be707d6367 (mariadb-10.4.4-87-gabde8dcc4fd) parent(s): fda846b4af2fdb78a9c347650a51931ce499f351 author: Oleksandr Byelkin committer: Oleksandr Byelkin timestamp: 2019-05-14 16:09:44 +0200 message: postreview --- mysql-test/main/connect.result | 11 +++++++++++ mysql-test/main/connect.test | 25 +++++++++++++++++++++++-- 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/mysql-test/main/connect.result b/mysql-test/main/connect.result index 8fa7724cff0..4e5b1d7f6e2 100644 --- a/mysql-test/main/connect.result +++ b/mysql-test/main/connect.result @@ -428,5 +428,16 @@ Aborted_clients 0 Aborted_connects 1 Aborted_connects_preauth 1 FOUND 1 /This connection closed normally without authentication/ in mysqld.1.err +FOUND 52 /unauthenticated/ in mysqld.1.err +SET @save_connect_timeout= @@connect_timeout; +SET GLOBAL connect_timeout=2; +SHOW GLOBAL STATUS LIKE 'Aborted%'; +Variable_name Value +Aborted_clients 0 +Aborted_connects 2 +Aborted_connects_preauth 2 +FOUND 2 /This connection closed normally without authentication/ in mysqld.1.err +FOUND 53 /unauthenticated/ in mysqld.1.err SET GLOBAL log_warnings=default; +SET GLOBAL connect_timeout= @save_connect_timeout; # End of 10.4 tests diff --git a/mysql-test/main/connect.test b/mysql-test/main/connect.test index 1b804c2b0bb..083436d8630 100644 --- a/mysql-test/main/connect.test +++ b/mysql-test/main/connect.test @@ -479,11 +479,32 @@ EOF SHOW GLOBAL STATUS LIKE 'Aborted%'; ---let SEARCH_FILE=$MYSQLTEST_VARDIR/log/mysqld.1.err --let SEARCH_PATTERN= This connection closed normally without authentication --source include/search_pattern_in_file.inc -SET GLOBAL log_warnings=default; +--let SEARCH_PATTERN= unauthenticated +--source include/search_pattern_in_file.inc +SET @save_connect_timeout= @@connect_timeout; +SET GLOBAL connect_timeout=2; + +--perl +use Socket; +use autodie; +socket(SOCK, PF_INET, SOCK_STREAM, getprotobyname("tcp")); +connect(SOCK, pack_sockaddr_in($ENV{MASTER_MYPORT}, inet_aton("localhost"))); +sleep 3; +exit(0); +EOF + +SHOW GLOBAL STATUS LIKE 'Aborted%'; + +--let SEARCH_PATTERN= This connection closed normally without authentication +--source include/search_pattern_in_file.inc + +--let SEARCH_PATTERN= unauthenticated +--source include/search_pattern_in_file.inc +SET GLOBAL log_warnings=default; +SET GLOBAL connect_timeout= @save_connect_timeout; --echo # End of 10.4 tests