database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

MDEV-10201 SSL tests fail on fedora23

Browse Source 
Fixed the remaining failing test case in 10.1
This commit is contained in:
Vladislav Vaintroub
2016-09-28 22:12:03 +02:00
parent 9ff9acb307
commit b34c813ae3
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mysql-test/r/userstat.result
View File

@ -80,9 +80,9 @@ delete from t1 where a=3;
select * from t1 where a=999; select * from t1 where a=999;
a b a b
drop table t1; drop table t1;
SHOW STATUS LIKE 'Ssl_cipher'; SELECT (VARIABLE_VALUE <> '') AS have_ssl FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME='Ssl_cipher';
Variable_name Value have_ssl
Ssl_cipher DHE-RSA-AES256-SHA 1
create table t1 (a int, primary key (a), b int default 0) engine=innodb; create table t1 (a int, primary key (a), b int default 0) engine=innodb;
begin; begin;
insert into t1 values(1,1); insert into t1 values(1,1);
@ -147,11 +147,11 @@ TOTAL_CONNECTIONS 2
TOTAL_SSL_CONNECTIONS 1 TOTAL_SSL_CONNECTIONS 1
CONCURRENT_CONNECTIONS 0 CONCURRENT_CONNECTIONS 0
ROWS_READ 6 ROWS_READ 6
ROWS_SENT 2 ROWS_SENT 3
ROWS_DELETED 1 ROWS_DELETED 1
ROWS_INSERTED 7 ROWS_INSERTED 7
ROWS_UPDATED 5 ROWS_UPDATED 5
SELECT_COMMANDS 3 SELECT_COMMANDS 4
UPDATE_COMMANDS 11 UPDATE_COMMANDS 11
OTHER_COMMANDS 7 OTHER_COMMANDS 7
COMMIT_TRANSACTIONS 19 COMMIT_TRANSACTIONS 19
@ -165,11 +165,11 @@ TOTAL_CONNECTIONS 2
TOTAL_SSL_CONNECTIONS 1 TOTAL_SSL_CONNECTIONS 1
CONCURRENT_CONNECTIONS 0 CONCURRENT_CONNECTIONS 0
ROWS_READ 6 ROWS_READ 6
ROWS_SENT 2 ROWS_SENT 3
ROWS_DELETED 1 ROWS_DELETED 1
ROWS_INSERTED 7 ROWS_INSERTED 7
ROWS_UPDATED 5 ROWS_UPDATED 5
SELECT_COMMANDS 3 SELECT_COMMANDS 4
UPDATE_COMMANDS 11 UPDATE_COMMANDS 11
OTHER_COMMANDS 7 OTHER_COMMANDS 7
COMMIT_TRANSACTIONS 19 COMMIT_TRANSACTIONS 19

3
mysql-test/t/userstat.test
View File

@ -35,8 +35,7 @@ drop table t1;
# test SSL connections # test SSL connections
--connect (ssl_con,localhost,root,,,,,SSL) --connect (ssl_con,localhost,root,,,,,SSL)
--replace_result DHE-RSA-AES256-GCM-SHA384 DHE-RSA-AES256-SHA SELECT (VARIABLE_VALUE <> '') AS have_ssl FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME='Ssl_cipher';
SHOW STATUS LIKE 'Ssl_cipher';
--connection default --connection default
# #