[Commits] 3bf1572b425: fix the test for windows

Oleksandr Byelkin sanja at mariadb.com
Wed May 15 10:13:31 EEST 2019


revision-id: 3bf1572b4255431ad636d02493fed25ec7f1c381 (mariadb-10.4.4-90-g3bf1572b425)
parent(s): 30ddf961130aa4f4794cc97ced2f4122b456c65c
author: Oleksandr Byelkin
committer: Oleksandr Byelkin
timestamp: 2019-05-15 09:13:31 +0200
message:

fix the test for windows

---
 mysql-test/main/connect.result | 11 +++--------
 mysql-test/main/connect.test   | 11 +++--------
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/mysql-test/main/connect.result b/mysql-test/main/connect.result
index 4e5b1d7f6e2..49d76c5c576 100644
--- a/mysql-test/main/connect.result
+++ b/mysql-test/main/connect.result
@@ -415,29 +415,24 @@ SET global secure_auth=default;
 # connection is aborted prior to authentication
 #
 flush status;
-SHOW GLOBAL STATUS LIKE 'Aborted%';
+SHOW GLOBAL STATUS LIKE 'Aborted_connects%';
 Variable_name	Value
-Aborted_clients	0
 Aborted_connects	0
 Aborted_connects_preauth	0
 SET GLOBAL log_warnings=2;
 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
-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%';
+SHOW GLOBAL STATUS LIKE 'Aborted_connects%';
 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 083436d8630..aad0103f773 100644
--- a/mysql-test/main/connect.test
+++ b/mysql-test/main/connect.test
@@ -462,7 +462,7 @@ SET global secure_auth=default;
 --echo #
 
 flush status;
-SHOW GLOBAL STATUS LIKE 'Aborted%';
+SHOW GLOBAL STATUS LIKE 'Aborted_connects%';
 
 SET GLOBAL log_warnings=2;
 --let SEARCH_FILE=$MYSQLTEST_VARDIR/log/mysqld.1.err
@@ -477,14 +477,11 @@ connect(SOCK, pack_sockaddr_in($ENV{MASTER_MYPORT}, inet_aton("localhost")));
 exit(0);
 EOF
 
-SHOW GLOBAL STATUS LIKE 'Aborted%';
+SHOW GLOBAL STATUS LIKE 'Aborted_connects%';
 
 --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 @save_connect_timeout= @@connect_timeout;
 SET GLOBAL connect_timeout=2;
 
@@ -497,13 +494,11 @@ sleep 3;
 exit(0);
 EOF
 
-SHOW GLOBAL STATUS LIKE 'Aborted%';
+SHOW GLOBAL STATUS LIKE 'Aborted_connects%';
 
 --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;
 


More information about the commits mailing list