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.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.result')
| -rw-r--r-- | mysql-test/r/ssl.result | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/mysql-test/r/ssl.result b/mysql-test/r/ssl.result index 57427a228eb..2b4bb419643 100644 --- a/mysql-test/r/ssl.result +++ b/mysql-test/r/ssl.result @@ -1,6 +1,9 @@ SHOW STATUS LIKE 'Ssl_cipher'; Variable_name Value -Ssl_cipher DHE-RSA-AES256-SHA +Ssl_cipher AES128-GCM-SHA256 +SELECT (VARIABLE_VALUE <> '') AS have_ssl FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME='Ssl_cipher'; +have_ssl +1 SHOW STATUS LIKE 'Ssl_server_not_before'; Variable_name Value Ssl_server_not_before Apr 25 14:55:05 2015 GMT @@ -2163,9 +2166,9 @@ Privat (Private Nutzung) Mobilfunk Warnings: Warning 1052 Column 'kundentyp' in group statement is ambiguous drop table t1; -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 aes_decrypt('MySQL','adf'); aes_decrypt('MySQL','adf') NULL |