diff options
author | Vladislav Vaintroub <wlad@mariadb.com> | 2016-07-11 21:29:18 +0200 |
---|---|---|
committer | Vladislav Vaintroub <wlad@mariadb.com> | 2016-07-12 12:21:38 +0200 |
commit | 31e763ddc545bda747ede3ee218f67d3a6749cfe (patch) | |
tree | 0e0c67d203ebd036a5e600f8a51d757b738f553a /mysql-test/r/ssl_timeout.result | |
parent | 7d4a7d8c5861e6587176052ea71c30ab12a49084 (diff) | |
download | mariadb-git-31e763ddc545bda747ede3ee218f67d3a6749cfe.tar.gz |
MDEV-10211 : fix ssl test not to use specific value of ssl_cipher, as it can change between different openssl/yassl version
Diffstat (limited to 'mysql-test/r/ssl_timeout.result')
-rw-r--r-- | mysql-test/r/ssl_timeout.result | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/r/ssl_timeout.result b/mysql-test/r/ssl_timeout.result index 356e931ba4d..d9ef0f7a16f 100644 --- a/mysql-test/r/ssl_timeout.result +++ b/mysql-test/r/ssl_timeout.result @@ -1,7 +1,7 @@ # connect with read timeout so SLEEP() should timeout # Check ssl turned on -SHOW STATUS LIKE 'Ssl_cipher'; -Variable_name Value -Ssl_cipher DHE-RSA-AES256-SHA +SELECT (VARIABLE_VALUE <> '') AS have_ssl FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME='Ssl_cipher'; +have_ssl +1 SELECT SLEEP(600); ERROR HY000: Lost connection to MySQL server during query |