diff options
author | unknown <brian@zim.(none)> | 2006-11-19 18:01:54 -0800 |
---|---|---|
committer | unknown <brian@zim.(none)> | 2006-11-19 18:01:54 -0800 |
commit | 7d6b4a1ab06b22505a68334aeae0204cf0e4bb7a (patch) | |
tree | 5a1d28bf16e44e62244be8effd391e8ebe3c51bc /sql/sql_plugin.cc | |
parent | 3e0eee1d7b530df3d4685acea74d1a8bb139e558 (diff) | |
download | mariadb-git-7d6b4a1ab06b22505a68334aeae0204cf0e4bb7a.tar.gz |
Refactored a number of engines to have correct init/deinit. Added pass support for "data" from plugin to plugin generic init to use memory location.
plugin/daemon_example/plug.in:
Switched the plug.in type (corrected)
sql/handler.h:
Added data pointer to use for engines.
sql/sql_plugin.cc:
Passing plugin to generic handlers to allow them to add data to "data"
storage/archive/ha_archive.cc:
Refactored. Now uses less logic for startup/shutdown.
storage/csv/ha_tina.cc:
Refactored init/deinit to use less code.
storage/example/ha_example.cc:
Refactored example to show correct behavior for init/deinit.
storage/example/ha_example.h:
Removed unneeded references to methods that do not need to be implemened.
storage/federated/ha_federated.cc:
Refactored to use less code and startup/shutdown correctly.
Diffstat (limited to 'sql/sql_plugin.cc')
-rw-r--r-- | sql/sql_plugin.cc | 4 |
1 files changed, 2 insertions, 2 deletions
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); |