diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-09-17 14:03:51 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-09-17 14:03:51 +0300 |
| commit | fe949504f0894686d434c6fbdac25efeb965253d (patch) | |
| tree | 11bf92cdbb0c0454453c5e920d0a833cb35ecf4e /mysql-test/include | |
| parent | ca906fb27361f615a1c21d5ae61c312d9ab0dd87 (diff) | |
| parent | 72c838b9fc3e5e9495d3c8e363ba85304b9db39a (diff) | |
| download | mariadb-git-fe949504f0894686d434c6fbdac25efeb965253d.tar.gz | |
Merge 10.2 into bb-10.2-ext
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 |