diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-01-03 16:10:02 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-01-03 16:10:02 +0200 |
| commit | fb0808c450849e00993fa38839f33969a9daf7e8 (patch) | |
| tree | 55aca4c3c7dff7e09a13efa6dcfb58d5e91def35 /sql/mysqld.cc | |
| parent | fb41117c907a99d051ac09c229762978373d7eb0 (diff) | |
| parent | 8760f6907c51e0e20242a53188be5b62029d6f1a (diff) | |
| download | mariadb-git-fb0808c450849e00993fa38839f33969a9daf7e8.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 7cfa803c73a..1a55159a0e6 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -8548,12 +8548,6 @@ mysqld_get_one_option(int optid, const struct my_option *opt, char *argument) case (int) OPT_SKIP_HOST_CACHE: opt_specialflag|= SPECIAL_NO_HOST_CACHE; break; - case (int) OPT_SKIP_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; break; |