diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-01-10 15:06:25 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-01-10 15:06:25 +0200 |
| commit | cae5a0328bd70fa1bc877fc35fecc704fdb6f6cb (patch) | |
| tree | 8d4f7cd1c17be55f899e20a20f4b4f0b86a5fd53 /sql/mysqld.cc | |
| parent | 66f7f7998ceae4b6274c5e84738b2c0c8dfa3064 (diff) | |
| parent | 820ebcec8651d2478ece554f059a5513f0b2bedf (diff) | |
| download | mariadb-git-cae5a0328bd70fa1bc877fc35fecc704fdb6f6cb.tar.gz | |
Merge 10.9 into 10.10
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 9eea34a28ab..de6eb53762a 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -8202,12 +8202,6 @@ mysqld_get_one_option(const struct my_option *opt, const 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; |