summaryrefslogtreecommitdiff
path: root/sql/mysqld.cc
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2023-01-03 14:38:27 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2023-01-03 14:38:27 +0200
commitd54510716e3ed1c497eb45338dbc47dfd0c2d0b2 (patch)
tree94a3351755f524f29f7931ba33fbc9438132a82f /sql/mysqld.cc
parentfb41117c907a99d051ac09c229762978373d7eb0 (diff)
parente51a1d6fc0c105d56c6f05efb3d9fd05b7e4f22f (diff)
downloadmariadb-git-10.4-MDEV-29988-merge.tar.gz
WIP merge 10.3 into 10.410.4-MDEV-29988-merge
Diffstat (limited to 'sql/mysqld.cc')
-rw-r--r--sql/mysqld.cc6
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;