Commit b79daf41 authored by unknown's avatar unknown

Re-set the plugin name so that we can be sure the plugin init()

function doesn't set it to something else.

parent 6d0419f6
...@@ -5904,6 +5904,8 @@ int initialize_schema_table(st_plugin_int *plugin) ...@@ -5904,6 +5904,8 @@ int initialize_schema_table(st_plugin_int *plugin)
schema_table->old_format= make_old_format; schema_table->old_format= make_old_format;
schema_table->idx_field1= -1, schema_table->idx_field1= -1,
schema_table->idx_field2= -1; schema_table->idx_field2= -1;
/* Make the name available to the init() function. */
schema_table->table_name= plugin->name.str; schema_table->table_name= plugin->name.str;
if (plugin->plugin->init(schema_table)) if (plugin->plugin->init(schema_table))
...@@ -5912,6 +5914,9 @@ int initialize_schema_table(st_plugin_int *plugin) ...@@ -5912,6 +5914,9 @@ int initialize_schema_table(st_plugin_int *plugin)
plugin->name.str); plugin->name.str);
goto err; goto err;
} }
/* Make sure the plugin name is not set inside the init() function. */
schema_table->table_name= plugin->name.str;
} }
DBUG_RETURN(0); DBUG_RETURN(0);
......
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