database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

cleanup: remove unused PLUGIN_INIT_SKIP_DYNAMIC_LOADING

Browse Source
This commit is contained in:
Sergei Golubchik
2020-03-21 20:21:58 +01:00
parent 64be8c2bf2
commit 8ab693847e
2 changed files with 15 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
sql/sql_plugin.cc
View File

@ -1593,6 +1593,7 @@ int plugin_init(int *argc, char **argv, int flags)
MEM_ROOT tmp_root; MEM_ROOT tmp_root;
bool reaped_mandatory_plugin= false; bool reaped_mandatory_plugin= false;
bool mandatory= true; 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]; char plugin_table_engine_name_buf[NAME_CHAR_LEN + 1];
LEX_CSTRING plugin_table_engine_name= { plugin_table_engine_name_buf, 0 }; LEX_CSTRING plugin_table_engine_name= { plugin_table_engine_name_buf, 0 };
LEX_CSTRING MyISAM= { STRING_WITH_LEN("MyISAM") }; LEX_CSTRING MyISAM= { STRING_WITH_LEN("MyISAM") };
@ -1710,24 +1711,19 @@ int plugin_init(int *argc, char **argv, int flags)
mysql_mutex_unlock(&LOCK_plugin); mysql_mutex_unlock(&LOCK_plugin);
/* Register (not initialize!) all dynamic plugins */ /* Register (not initialize!) all dynamic plugins */
if (!(flags & PLUGIN_INIT_SKIP_DYNAMIC_LOADING)) if (global_system_variables.log_warnings >= 9)
{ sql_print_information("Initializing plugins specified on the command line");
I_List_iterator<i_string> iter(opt_plugin_load_list); while (i_string *item= opt_plugin_load_list_iter++)
i_string *item; plugin_load_list(&tmp_root, item->ptr);
if (global_system_variables.log_warnings >= 9)
sql_print_information("Initializing plugins specified on the command line");
while (NULL != (item= iter++))
plugin_load_list(&tmp_root, item->ptr);
if (!(flags & PLUGIN_INIT_SKIP_PLUGIN_TABLE)) if (!(flags & PLUGIN_INIT_SKIP_PLUGIN_TABLE))
{ {
char path[FN_REFLEN + 1]; char path[FN_REFLEN + 1];
build_table_filename(path, sizeof(path) - 1, "mysql", "plugin", reg_ext, 0); build_table_filename(path, sizeof(path) - 1, "mysql", "plugin", reg_ext, 0);
bool dummy; bool dummy;
Table_type ttype= dd_frm_type(0, path, &plugin_table_engine_name, &dummy); Table_type ttype= dd_frm_type(0, path, &plugin_table_engine_name, &dummy);
if (ttype != TABLE_TYPE_NORMAL) if (ttype != TABLE_TYPE_NORMAL)
plugin_table_engine_name=empty_clex_str; plugin_table_engine_name=empty_clex_str;
}
} }
/* /*

5
sql/sql_plugin.h
View File

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