From b83aff56f10caaa24a11d2fa9d17fd7930d5de25 Mon Sep 17 00:00:00 2001 From: Monty Date: Thu, 6 Jun 2019 15:25:15 +0300 Subject: [PATCH] Support skip-plugin-load - --disable-plugin-load or --skip-plugin-load will now reset plugin load list. Needed for future changes to mtr tests --- sql/mysqld.cc | 2 ++ 1 file changed, 2 insertions(+) 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));