Skip to content

Commit b34c813

Browse files
committed
MDEV-10201 SSL tests fail on fedora23
Fixed the remaining failing test case in 10.1
1 parent 9ff9acb commit b34c813

File tree

2 files changed

+8
-9
lines changed

2 files changed

+8
-9
lines changed

mysql-test/r/userstat.result

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,9 @@ delete from t1 where a=3;
8080
select * from t1 where a=999;
8181
a b
8282
drop table t1;
83-
SHOW STATUS LIKE 'Ssl_cipher';
84-
Variable_name Value
85-
Ssl_cipher DHE-RSA-AES256-SHA
83+
SELECT (VARIABLE_VALUE <> '') AS have_ssl FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME='Ssl_cipher';
84+
have_ssl
85+
1
8686
create table t1 (a int, primary key (a), b int default 0) engine=innodb;
8787
begin;
8888
insert into t1 values(1,1);
@@ -147,11 +147,11 @@ TOTAL_CONNECTIONS 2
147147
TOTAL_SSL_CONNECTIONS 1
148148
CONCURRENT_CONNECTIONS 0
149149
ROWS_READ 6
150-
ROWS_SENT 2
150+
ROWS_SENT 3
151151
ROWS_DELETED 1
152152
ROWS_INSERTED 7
153153
ROWS_UPDATED 5
154-
SELECT_COMMANDS 3
154+
SELECT_COMMANDS 4
155155
UPDATE_COMMANDS 11
156156
OTHER_COMMANDS 7
157157
COMMIT_TRANSACTIONS 19
@@ -165,11 +165,11 @@ TOTAL_CONNECTIONS 2
165165
TOTAL_SSL_CONNECTIONS 1
166166
CONCURRENT_CONNECTIONS 0
167167
ROWS_READ 6
168-
ROWS_SENT 2
168+
ROWS_SENT 3
169169
ROWS_DELETED 1
170170
ROWS_INSERTED 7
171171
ROWS_UPDATED 5
172-
SELECT_COMMANDS 3
172+
SELECT_COMMANDS 4
173173
UPDATE_COMMANDS 11
174174
OTHER_COMMANDS 7
175175
COMMIT_TRANSACTIONS 19

mysql-test/t/userstat.test

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,7 @@ drop table t1;
3535

3636
# test SSL connections
3737
--connect (ssl_con,localhost,root,,,,,SSL)
38-
--replace_result DHE-RSA-AES256-GCM-SHA384 DHE-RSA-AES256-SHA
39-
SHOW STATUS LIKE 'Ssl_cipher';
38+
SELECT (VARIABLE_VALUE <> '') AS have_ssl FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME='Ssl_cipher';
4039
--connection default
4140

4241
#

0 commit comments

Comments
 (0)