diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2018-11-21 16:59:11 +0200 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2018-11-21 16:59:11 +0200 |
| commit | 06063e8a41b8165dd822ffee9e431eef491d70f9 (patch) | |
| tree | b91741f9c450ef8eda7678bf02f09925c1d7e2c6 /mysql-test/include | |
| parent | b86e18cb44fd4ab42c08e4b7aae1b7e131a3ea46 (diff) | |
| parent | 8324e5e84dc786b2d4a07d7798f26ddea239159e (diff) | |
| download | mariadb-git-06063e8a41b8165dd822ffee9e431eef491d70f9.tar.gz | |
Merge remote-tracking branch 'origin/10.1' into 10.2
Diffstat (limited to 'mysql-test/include')
| -rw-r--r-- | mysql-test/include/innodb_encrypt_tables.combinations | 14 | ||||
| -rw-r--r-- | mysql-test/include/innodb_encrypt_tables.inc | 4 |
2 files changed, 18 insertions, 0 deletions
diff --git a/mysql-test/include/innodb_encrypt_tables.combinations b/mysql-test/include/innodb_encrypt_tables.combinations new file mode 100644 index 00000000000..cb32fea998a --- /dev/null +++ b/mysql-test/include/innodb_encrypt_tables.combinations @@ -0,0 +1,14 @@ +[crypt] +innodb_encrypt_tables=ON +plugin-load-add=$FILE_KEY_MANAGEMENT_SO +loose-file-key-management +loose-file-key-management-filename=$MYSQL_TEST_DIR/std_data/keys.txt +file-key-management-encryption-algorithm=aes_ctr + +[clear] +innodb_encrypt_tables=OFF +plugin-load-add=$FILE_KEY_MANAGEMENT_SO +loose-file-key-management +loose-file-key-management-filename=$MYSQL_TEST_DIR/std_data/keys.txt +file-key-management-encryption-algorithm=aes_ctr + diff --git a/mysql-test/include/innodb_encrypt_tables.inc b/mysql-test/include/innodb_encrypt_tables.inc new file mode 100644 index 00000000000..31ab7999aef --- /dev/null +++ b/mysql-test/include/innodb_encrypt_tables.inc @@ -0,0 +1,4 @@ +# The goal of including this file is to enable innodb_encrypt_tables combinations +# (see include/innodb_encrypt_tables.combinations) + +--source include/have_innodb.inc |