Skip to content

Commit b83aff5

Browse files
committed
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 parent d6d5c16 commit b83aff5

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

sql/mysqld.cc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9316,6 +9316,8 @@ mysqld_get_one_option(int optid, const struct my_option *opt, char *argument)
93169316
break;
93179317
case OPT_PLUGIN_LOAD:
93189318
free_list(opt_plugin_load_list_ptr);
9319+
if (argument == disabled_my_option)
9320+
break; // Resets plugin list
93199321
/* fall through */
93209322
case OPT_PLUGIN_LOAD_ADD:
93219323
opt_plugin_load_list_ptr->push_back(new i_string(argument));

0 commit comments

Comments
 (0)