From ca23558a0561856cc7f3c1ab5db4025102482380 Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <serg@mariadb.org>
Date: Mon, 12 Dec 2022 13:18:46 +0100
Subject: --skip-name-resolve=0 didn't work

custom code in `case OPT_SKIP_RESOLVE`
was overriding the correct value from handle_options().
---
 sql/mysqld.cc | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'sql/mysqld.cc')

diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index d58f2ed557f..b1cf5ab2796 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -9484,12 +9484,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;
-- 
cgit v1.2.1