diff options
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/handler.h | 1 | ||||
| -rw-r--r-- | sql/sql_plugin.cc | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/sql/handler.h b/sql/handler.h index 888f837d427..f27912f4d1e 100644 --- a/sql/handler.h +++ b/sql/handler.h @@ -684,6 +684,7 @@ struct handlerton int (*table_exists_in_engine)(handlerton *hton, THD* thd, const char *db, const char *name); uint32 license; /* Flag for Engine License */ + void *data; /* Location for engines to keep personal structures */ }; diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc index c788d26c147..8982db9e6b3 100644 --- a/sql/sql_plugin.cc +++ b/sql/sql_plugin.cc @@ -515,7 +515,7 @@ void plugin_deinitialize(struct st_plugin_int *plugin) else if (plugin->plugin->deinit) { DBUG_PRINT("info", ("Deinitializing plugin: '%s'", plugin->name.str)); - if (plugin->plugin->deinit(NULL)) + if (plugin->plugin->deinit(plugin)) { DBUG_PRINT("warning", ("Plugin '%s' deinit function returned error.", plugin->name.str)); @@ -575,7 +575,7 @@ static int plugin_initialize(struct st_plugin_int *plugin) } else if (plugin->plugin->init) { - if (plugin->plugin->init(NULL)) + if (plugin->plugin->init(plugin)) { sql_print_error("Plugin '%s' init function returned error.", plugin->name.str); |