diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-04 17:01:00 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-04 17:01:00 +0200 |
commit | a2fc36989e13c6f322fd22791f67e0d1275461d7 (patch) | |
tree | 9cba675c50883e2e45c61a94b631d8875d16ddf9 /mysql-test/main/ssl.result | |
parent | 82da98556cf58f0fbb43c82e9c6ae1a887b6cf3d (diff) | |
parent | 74d648db12e100c628548fb2e5aa67de718bd1fb (diff) | |
download | mariadb-git-a2fc36989e13c6f322fd22791f67e0d1275461d7.tar.gz |
Merge 10.2 into 10.3
Diffstat (limited to 'mysql-test/main/ssl.result')
-rw-r--r-- | mysql-test/main/ssl.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/main/ssl.result b/mysql-test/main/ssl.result index bd2d650acc5..8de36f55ecf 100644 --- a/mysql-test/main/ssl.result +++ b/mysql-test/main/ssl.result @@ -4,10 +4,10 @@ have_ssl 1 SHOW STATUS LIKE 'Ssl_server_not_before'; Variable_name Value -Ssl_server_not_before Apr 25 20:52:21 2017 GMT +Ssl_server_not_before Jan 27 10:11:10 2019 GMT SHOW STATUS LIKE 'Ssl_server_not_after'; Variable_name Value -Ssl_server_not_after Apr 20 20:52:21 2037 GMT +Ssl_server_not_after Jan 22 10:11:10 2039 GMT drop table if exists t1,t2,t3,t4; CREATE TABLE t1 ( Period smallint(4) unsigned zerofill DEFAULT '0000' NOT NULL, |