cleanup: remove unused PLUGIN_INIT_SKIP_DYNAMIC_LOADING

sql/sql_plugin.cc

@@ -1593,6 +1593,7 @@ int plugin_init(int *argc, char **argv, int flags)
   MEM_ROOT tmp_root;
   bool reaped_mandatory_plugin= false;
   bool mandatory= true;
+  I_List_iterator<i_string> opt_plugin_load_list_iter(opt_plugin_load_list);
   char plugin_table_engine_name_buf[NAME_CHAR_LEN + 1];
   LEX_CSTRING plugin_table_engine_name= { plugin_table_engine_name_buf, 0 };
   LEX_CSTRING MyISAM= { STRING_WITH_LEN("MyISAM") };
@@ -1710,13 +1711,9 @@ int plugin_init(int *argc, char **argv, int flags)
   mysql_mutex_unlock(&LOCK_plugin);
 
   /* Register (not initialize!) all dynamic plugins */
-  if (!(flags & PLUGIN_INIT_SKIP_DYNAMIC_LOADING))
-  {
-    I_List_iterator<i_string> iter(opt_plugin_load_list);
-    i_string *item;
   if (global_system_variables.log_warnings >= 9)
     sql_print_information("Initializing plugins specified on the command line");
-    while (NULL != (item= iter++))
+  while (i_string *item= opt_plugin_load_list_iter++)
     plugin_load_list(&tmp_root, item->ptr);
 
   if (!(flags & PLUGIN_INIT_SKIP_PLUGIN_TABLE))
@@ -1728,7 +1725,6 @@ int plugin_init(int *argc, char **argv, int flags)
     if (ttype != TABLE_TYPE_NORMAL)
       plugin_table_engine_name=empty_clex_str;
   }
-  }
 
   /*
     Now we initialize all remaining plugins

sql/sql_plugin.h

@@ -55,9 +55,8 @@ extern ulong dlopen_count;
 /*
   the following flags are valid for plugin_init()
 */
-#define PLUGIN_INIT_SKIP_DYNAMIC_LOADING 1U
-#define PLUGIN_INIT_SKIP_PLUGIN_TABLE    2U
-#define PLUGIN_INIT_SKIP_INITIALIZATION  4U
+#define PLUGIN_INIT_SKIP_PLUGIN_TABLE    1U
+#define PLUGIN_INIT_SKIP_INITIALIZATION  2U
 
 #define INITIAL_LEX_PLUGIN_LIST_SIZE    16