diff options
| author | Elena Stepanova <elenst@linux-0bhr.suse> | 2016-04-20 00:58:13 +0300 |
|---|---|---|
| committer | Elena Stepanova <elenst@linux-0bhr.suse> | 2016-04-20 00:58:13 +0300 |
| commit | 7f300d2c932296936376a8e29379156ef1f86ea8 (patch) | |
| tree | fecbb2bae2c227c83035fdc7b7457181a698e41e | |
| parent | 0a38955916a531c20a3b966a10c3c5c2320182e5 (diff) | |
| download | mariadb-git-bb-10.1-elenst-mdev9909.tar.gz | |
Next part of experimental change for MDEV-9909bb-10.1-elenst-mdev9909
Do not allow file_key_management and example_key_management
to be loaded together, we already know it does not work (MDEV-9948)
| -rw-r--r-- | mysql-test/include/default_mysqld.cnf | 1 | ||||
| -rw-r--r-- | mysql-test/suite/encryption/include/have_example_key_management_plugin.opt | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/include/default_mysqld.cnf b/mysql-test/include/default_mysqld.cnf index d90d0344ae1..41af17543b6 100644 --- a/mysql-test/include/default_mysqld.cnf +++ b/mysql-test/include/default_mysqld.cnf @@ -107,6 +107,7 @@ binlog-direct-non-transactional-updates default-storage-engine=myisam loose-file-key-management-filename=@ENV.MYSQLTEST_VARDIR/std_data/keys.txt +loose-skip-plugin-example-key-management # here, at the end of [mysqld] group mtr will automatically disable # all optional plugins. diff --git a/mysql-test/suite/encryption/include/have_example_key_management_plugin.opt b/mysql-test/suite/encryption/include/have_example_key_management_plugin.opt index ce7f1ddef7e..7390be5804c 100644 --- a/mysql-test/suite/encryption/include/have_example_key_management_plugin.opt +++ b/mysql-test/suite/encryption/include/have_example_key_management_plugin.opt @@ -1,2 +1,3 @@ --plugin-load-add=$EXAMPLE_KEY_MANAGEMENT_SO --loose-example-key-management +--loose-skip-plugin-file-key-management |