diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-12-17 20:04:03 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-12-17 20:15:38 +0200 |
| commit | 7d245083a43e34d94822e580037727bdbb50b6f0 (patch) | |
| tree | efc1a1e7f2505079e24ac5d6814041a4394434e2 /mysql-test/include | |
| parent | 10e01b56f734d306897d2a59d091e6c421943e6b (diff) | |
| parent | 8c43f963882a9d5ac4e4289c8dd3dbcaeb40a0ce (diff) | |
| download | mariadb-git-7d245083a43e34d94822e580037727bdbb50b6f0.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'mysql-test/include')
| -rw-r--r-- | mysql-test/include/innodb_encrypt_tables.combinations | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/include/innodb_encrypt_tables.combinations b/mysql-test/include/innodb_encrypt_tables.combinations index cb32fea998a..4ca9b672119 100644 --- a/mysql-test/include/innodb_encrypt_tables.combinations +++ b/mysql-test/include/innodb_encrypt_tables.combinations @@ -3,12 +3,12 @@ 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 +file-key-management-encryption-algorithm=aes_cbc [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 +file-key-management-encryption-algorithm=aes_cbc |