diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-09-18 11:38:07 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-09-18 11:38:07 +0300 |
| commit | e17a282da94b3d85d24688d78583308421998a5d (patch) | |
| tree | eefd039db287faae22e56d5ab570cdaee52a9805 /mysql-test/include | |
| parent | 3060f9afd6c0f838f0fafede7243d6b4f8325baa (diff) | |
| parent | 4cfef2a5a4157269244923637032c21ff67b0161 (diff) | |
| download | mariadb-git-e17a282da94b3d85d24688d78583308421998a5d.tar.gz | |
Merge bb-10.2-ext into 10.3
Diffstat (limited to 'mysql-test/include')
| -rw-r--r-- | mysql-test/include/innodb_encrypt_log.combinations | 7 | ||||
| -rw-r--r-- | mysql-test/include/innodb_encrypt_log.inc | 4 |
2 files changed, 11 insertions, 0 deletions
diff --git a/mysql-test/include/innodb_encrypt_log.combinations b/mysql-test/include/innodb_encrypt_log.combinations new file mode 100644 index 00000000000..fd21a57c3c2 --- /dev/null +++ b/mysql-test/include/innodb_encrypt_log.combinations @@ -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 diff --git a/mysql-test/include/innodb_encrypt_log.inc b/mysql-test/include/innodb_encrypt_log.inc new file mode 100644 index 00000000000..5beebeae81f --- /dev/null +++ b/mysql-test/include/innodb_encrypt_log.inc @@ -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 |