Commit a2d34ff5 authored by Brandon Nesterenko's avatar Brandon Nesterenko

MDEV-34348: Fix sql_plugin bad function cast

parent 5a61fd58
...@@ -1445,17 +1445,20 @@ static int plugin_do_initialize(struct st_plugin_int *plugin, uint &state) ...@@ -1445,17 +1445,20 @@ static int plugin_do_initialize(struct st_plugin_int *plugin, uint &state)
DBUG_ENTER("plugin_do_initialize"); DBUG_ENTER("plugin_do_initialize");
mysql_mutex_assert_not_owner(&LOCK_plugin); mysql_mutex_assert_not_owner(&LOCK_plugin);
plugin_type_init init= plugin_type_initialize[plugin->plugin->type]; plugin_type_init init= plugin_type_initialize[plugin->plugin->type];
if (!init) int ret= 0;
init= (plugin_type_init) plugin->plugin->init;
if (init) if (init)
if (int ret= init(plugin)) ret= init(plugin);
{ else if (plugin->plugin->init)
/* Plugin init failed and did not requested a retry */ ret= plugin->plugin->init(plugin);
if (ret != HA_ERR_RETRY_INIT)
print_init_failed_error(plugin); if (ret)
DBUG_RETURN(ret); {
} if (ret != HA_ERR_RETRY_INIT)
state= PLUGIN_IS_READY; // plugin->init() succeeded print_init_failed_error(plugin);
DBUG_RETURN(ret);
}
state= PLUGIN_IS_READY; // plugin initialization succeeded
if (plugin->plugin->status_vars) if (plugin->plugin->status_vars)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment