diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2015-06-24 07:16:08 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2015-06-24 07:16:08 +0300 |
| commit | 2e4984c185ddcd2da789017cd147338846ff409a (patch) | |
| tree | 0293831900c860600efbaa747ea886d9d1cbf5bd /mysql-test/r/ssl.result | |
| parent | 792b53e80806df893ee62c9a1c1bd117114c8c6d (diff) | |
| parent | a6087e7dc1ef3561d8189c8db15e9591d0f9b520 (diff) | |
| download | mariadb-git-10.0-FusionIO.tar.gz | |
Merge tag 'mariadb-10.0.20' into 10.0-FusionIO10.0-FusionIO
Conflicts:
storage/innobase/os/os0file.cc
storage/xtradb/os/os0file.cc
storage/xtradb/srv/srv0start.cc
Diffstat (limited to 'mysql-test/r/ssl.result')
| -rw-r--r-- | mysql-test/r/ssl.result | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/mysql-test/r/ssl.result b/mysql-test/r/ssl.result index 868efcbdf31..57427a228eb 100644 --- a/mysql-test/r/ssl.result +++ b/mysql-test/r/ssl.result @@ -3,10 +3,10 @@ Variable_name Value Ssl_cipher DHE-RSA-AES256-SHA SHOW STATUS LIKE 'Ssl_server_not_before'; Variable_name Value -Ssl_server_not_before Feb 20 02:55:06 2010 GMT +Ssl_server_not_before Apr 25 14:55:05 2015 GMT SHOW STATUS LIKE 'Ssl_server_not_after'; Variable_name Value -Ssl_server_not_after Sep 3 02:55:06 2030 GMT +Ssl_server_not_after Apr 20 14:55:05 2035 GMT drop table if exists t1,t2,t3,t4; CREATE TABLE t1 ( Period smallint(4) unsigned zerofill DEFAULT '0000' NOT NULL, @@ -2166,3 +2166,9 @@ drop table t1; SHOW STATUS LIKE 'Ssl_cipher'; Variable_name Value Ssl_cipher DHE-RSA-AES256-SHA +select aes_decrypt('MySQL','adf'); +aes_decrypt('MySQL','adf') +NULL +select 'still connected?'; +still connected? +still connected? |