diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-07-13 12:09:59 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-07-13 12:09:59 +0200 |
| commit | 326a8dcd875b76faf85626942eb0e6ee76db304e (patch) | |
| tree | c0d5a91cd2315dd2ce8d06a16c62778c78ca6f0f /mysql-test/r/ssl.result | |
| parent | 64583629aded09f74d6d14178475fe6b2c849c00 (diff) | |
| parent | c6fdb92ca829fed893d9e7324e80b1450de16087 (diff) | |
| download | mariadb-git-326a8dcd875b76faf85626942eb0e6ee76db304e.tar.gz | |
Merge branch '10.0' into 10.1
Diffstat (limited to 'mysql-test/r/ssl.result')
| -rw-r--r-- | mysql-test/r/ssl.result | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/mysql-test/r/ssl.result b/mysql-test/r/ssl.result index a20e97b8284..e74aef8b940 100644 --- a/mysql-test/r/ssl.result +++ b/mysql-test/r/ssl.result @@ -1,6 +1,6 @@ -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 SHOW STATUS LIKE 'Ssl_server_not_before'; Variable_name Value Ssl_server_not_before Apr 25 14:55:05 2015 GMT @@ -2163,9 +2163,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 |