diff options
author | Sergei Golubchik <serg@mariadb.org> | 2015-02-18 15:16:27 +0100 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2015-02-18 15:16:27 +0100 |
commit | d7e7862364ae344fea5657eb5aae9db3fbb84553 (patch) | |
tree | 38f30e541f98dae9092a09cf030de8f2a336bfd1 /mysql-test/r/ssl.result | |
parent | a06624d61f36c70edd63adcfe2803bb7a8564de5 (diff) | |
parent | fdd6c111c254c5044cd9b6c2f7e4d0c74f427a79 (diff) | |
download | mariadb-git-d7e7862364ae344fea5657eb5aae9db3fbb84553.tar.gz |
Merge branch '5.5' into 10.0
Diffstat (limited to 'mysql-test/r/ssl.result')
-rw-r--r-- | mysql-test/r/ssl.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/ssl.result b/mysql-test/r/ssl.result index 0997e8d3e13..6f0ba6a4e1e 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 Jan 29 13:33:36 2015 GMT +Ssl_server_not_before Dec 5 04:48:40 2014 GMT SHOW STATUS LIKE 'Ssl_server_not_after'; Variable_name Value -Ssl_server_not_after Jan 24 13:33:36 2035 GMT +Ssl_server_not_after Dec 1 04:48:40 2029 GMT drop table if exists t1,t2,t3,t4; CREATE TABLE t1 ( Period smallint(4) unsigned zerofill DEFAULT '0000' NOT NULL, |