Support skip-plugin-load

- --disable-plugin-load or --skip-plugin-load will now reset plugin load
  list. Needed for future changes to mtr tests

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));