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

Merge bb-10.2-ext into 10.3

Browse Source
This commit is contained in:
Marko Mäkelä
2017-09-18 11:38:07 +03:00
parent 3060f9afd6 4cfef2a5a4
commit e17a282da9
72 changed files with 3940 additions and 1239 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mysql-test/include/innodb_encrypt_log.combinations Normal file
View File

@@ -0,0 +1,7 @@
[crypt]
innodb_encrypt_log=ON
innodb_encryption_rotate_key_age=1
plugin_load_add=$DEBUG_KEY_MANAGEMENT_SO
[clear]
skip_innodb_encrypt_log

4
mysql-test/include/innodb_encrypt_log.inc Normal file
View File

@@ -0,0 +1,4 @@
# The goal of including this file is to enable innodb_encrypt_log combinations
# (see include/innodb_encrypt_log.combinations)
--source include/have_innodb.inc