database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge 10.1 into 10.2

Browse Source 
Also, include fixes by Vladislav Vaintroub to the
aws_key_management plugin. The AWS C++ SDK specifically depends on
OPENSSL_LIBRARIES, not generic SSL_LIBRARIES (such as YaSSL).
This commit is contained in:
Marko Mäkelä
2017-05-06 14:36:46 +03:00
parent baad0f3484 b82c602db5
commit 14c6f00a9f
217 changed files with 30599 additions and 1665 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/r/ssl.result
View File

@ -4,10 +4,10 @@ have_ssl
1
SHOW STATUS LIKE 'Ssl_server_not_before';
Variable_name Value
Ssl_server_not_before Apr 25 14:55:05 2015 GMT
Ssl_server_not_before Apr 25 20:52:21 2017 GMT
SHOW STATUS LIKE 'Ssl_server_not_after';
Variable_name Value
Ssl_server_not_after Apr 20 14:55:05 2035 GMT
Ssl_server_not_after Apr 20 20:52:21 2037 GMT
drop table if exists t1,t2,t3,t4;
CREATE TABLE t1 (
Period smallint(4) unsigned zerofill DEFAULT '0000' NOT NULL,