diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-06-11 13:00:18 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-06-11 13:00:18 +0300 |
| commit | b42dbdbccd3b939394ca9b608ad91a04235e95f1 (patch) | |
| tree | e969f314963faa202fdb6f87d5aca67810844742 /sql/mysqld.cc | |
| parent | 490dcfd5d74ce45cbdd6105e4295116f6a944e2b (diff) | |
| parent | cbac8f935182ecc5bb907de3ae48942467f0b8ba (diff) | |
| download | mariadb-git-b42dbdbccd3b939394ca9b608ad91a04235e95f1.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index e8c605ce945..4b31b78fc21 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -9411,8 +9411,10 @@ mysqld_get_one_option(int optid, const struct my_option *opt, char *argument) opt_specialflag|= SPECIAL_NO_HOST_CACHE; break; case (int) OPT_SKIP_RESOLVE: - opt_skip_name_resolve= 1; - opt_specialflag|=SPECIAL_NO_RESOLVE; + if ((opt_skip_name_resolve= (argument != disabled_my_option))) + opt_specialflag|= SPECIAL_NO_RESOLVE; + else + opt_specialflag&= ~SPECIAL_NO_RESOLVE; break; case (int) OPT_WANT_CORE: test_flags |= TEST_CORE_ON_SIGNAL; @@ -9471,6 +9473,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)); |