diff options
author | Monty <monty@mariadb.org> | 2019-06-06 15:25:15 +0300 |
---|---|---|
committer | Monty <monty@mariadb.org> | 2019-06-06 15:25:15 +0300 |
commit | b83aff56f10caaa24a11d2fa9d17fd7930d5de25 (patch) | |
tree | a37be8caef5cd602566590f25d552cee241266b3 | |
parent | d6d5c168cf106535d719c4715986dac4767254ea (diff) | |
download | mariadb-git-b83aff56f10caaa24a11d2fa9d17fd7930d5de25.tar.gz |
Support skip-plugin-load
- --disable-plugin-load or --skip-plugin-load will now reset plugin load
list. Needed for future changes to mtr tests
-rw-r--r-- | sql/mysqld.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 60dce5a7ff3..bafc92696c4 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -9316,6 +9316,8 @@ mysqld_get_one_option(int optid, const struct my_option *opt, char *argument) break; case OPT_PLUGIN_LOAD: free_list(opt_plugin_load_list_ptr); + if (argument == disabled_my_option) + break; // Resets plugin list /* fall through */ case OPT_PLUGIN_LOAD_ADD: opt_plugin_load_list_ptr->push_back(new i_string(argument)); |