diff options
author | Sergei Golubchik <sergii@pisem.net> | 2014-11-19 17:23:39 +0100 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2014-11-19 17:23:39 +0100 |
commit | 3495801e2e94df5a10cae6e056f65defa038a6b6 (patch) | |
tree | de524b4bf45dbc19a95262843f2b72d0f5adb7bc /mysql-test/t/ssl.test | |
parent | df7b27f1fe308fd4011fa020bebd7c69bcd43383 (diff) | |
parent | 496fda66fdc34b447ef4dec26d1250b034a321e3 (diff) | |
download | mariadb-git-3495801e2e94df5a10cae6e056f65defa038a6b6.tar.gz |
5.5 merge
Diffstat (limited to 'mysql-test/t/ssl.test')
-rw-r--r-- | mysql-test/t/ssl.test | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/t/ssl.test b/mysql-test/t/ssl.test index eb4da99588c..988a9d6c056 100644 --- a/mysql-test/t/ssl.test +++ b/mysql-test/t/ssl.test @@ -11,6 +11,7 @@ connect (ssl_con,localhost,root,,,,,SSL); # Check ssl turned on +--replace_result DHE-RSA-AES256-GCM-SHA384 DHE-RSA-AES256-SHA SHOW STATUS LIKE 'Ssl_cipher'; # Check ssl expiration @@ -21,6 +22,7 @@ SHOW STATUS LIKE 'Ssl_server_not_after'; -- source include/common-tests.inc # Check ssl turned on +--replace_result DHE-RSA-AES256-GCM-SHA384 DHE-RSA-AES256-SHA SHOW STATUS LIKE 'Ssl_cipher'; connection default; |