Commit 5cf40223 authored by Oleksandr Byelkin's avatar Oleksandr Byelkin

fix the test for windows

parent 51dcdf2a
...@@ -415,29 +415,24 @@ SET global secure_auth=default; ...@@ -415,29 +415,24 @@ SET global secure_auth=default;
# connection is aborted prior to authentication # connection is aborted prior to authentication
# #
flush status; flush status;
SHOW GLOBAL STATUS LIKE 'Aborted%'; SHOW GLOBAL STATUS LIKE 'Aborted_connects%';
Variable_name Value Variable_name Value
Aborted_clients 0
Aborted_connects 0 Aborted_connects 0
Aborted_connects_preauth 0 Aborted_connects_preauth 0
SET GLOBAL log_warnings=2; SET GLOBAL log_warnings=2;
NOT FOUND /This connection closed normally without authentication/ in mysqld.1.err NOT FOUND /This connection closed normally without authentication/ in mysqld.1.err
SHOW GLOBAL STATUS LIKE 'Aborted%'; SHOW GLOBAL STATUS LIKE 'Aborted_connects%';
Variable_name Value Variable_name Value
Aborted_clients 0
Aborted_connects 1 Aborted_connects 1
Aborted_connects_preauth 1 Aborted_connects_preauth 1
FOUND 1 /This connection closed normally without authentication/ in mysqld.1.err 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 @save_connect_timeout= @@connect_timeout;
SET GLOBAL connect_timeout=2; SET GLOBAL connect_timeout=2;
SHOW GLOBAL STATUS LIKE 'Aborted%'; SHOW GLOBAL STATUS LIKE 'Aborted_connects%';
Variable_name Value Variable_name Value
Aborted_clients 0
Aborted_connects 2 Aborted_connects 2
Aborted_connects_preauth 2 Aborted_connects_preauth 2
FOUND 2 /This connection closed normally without authentication/ in mysqld.1.err 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 log_warnings=default;
SET GLOBAL connect_timeout= @save_connect_timeout; SET GLOBAL connect_timeout= @save_connect_timeout;
# End of 10.4 tests # End of 10.4 tests
...@@ -462,7 +462,7 @@ SET global secure_auth=default; ...@@ -462,7 +462,7 @@ SET global secure_auth=default;
--echo # --echo #
flush status; flush status;
SHOW GLOBAL STATUS LIKE 'Aborted%'; SHOW GLOBAL STATUS LIKE 'Aborted_connects%';
SET GLOBAL log_warnings=2; SET GLOBAL log_warnings=2;
--let SEARCH_FILE=$MYSQLTEST_VARDIR/log/mysqld.1.err --let SEARCH_FILE=$MYSQLTEST_VARDIR/log/mysqld.1.err
...@@ -477,14 +477,11 @@ connect(SOCK, pack_sockaddr_in($ENV{MASTER_MYPORT}, inet_aton("localhost"))); ...@@ -477,14 +477,11 @@ connect(SOCK, pack_sockaddr_in($ENV{MASTER_MYPORT}, inet_aton("localhost")));
exit(0); exit(0);
EOF EOF
SHOW GLOBAL STATUS LIKE 'Aborted%'; SHOW GLOBAL STATUS LIKE 'Aborted_connects%';
--let SEARCH_PATTERN= This connection closed normally without authentication --let SEARCH_PATTERN= This connection closed normally without authentication
--source include/search_pattern_in_file.inc --source include/search_pattern_in_file.inc
--let SEARCH_PATTERN= unauthenticated
--source include/search_pattern_in_file.inc
SET @save_connect_timeout= @@connect_timeout; SET @save_connect_timeout= @@connect_timeout;
SET GLOBAL connect_timeout=2; SET GLOBAL connect_timeout=2;
...@@ -497,13 +494,11 @@ sleep 3; ...@@ -497,13 +494,11 @@ sleep 3;
exit(0); exit(0);
EOF EOF
SHOW GLOBAL STATUS LIKE 'Aborted%'; SHOW GLOBAL STATUS LIKE 'Aborted_connects%';
--let SEARCH_PATTERN= This connection closed normally without authentication --let SEARCH_PATTERN= This connection closed normally without authentication
--source include/search_pattern_in_file.inc --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 log_warnings=default;
SET GLOBAL connect_timeout= @save_connect_timeout; SET GLOBAL connect_timeout= @save_connect_timeout;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment