diff options
| author | unknown <brian@zim.(none)> | 2006-08-29 11:58:12 -0700 |
|---|---|---|
| committer | unknown <brian@zim.(none)> | 2006-08-29 11:58:12 -0700 |
| commit | 2f8849e2aafc9f95390024f35572dc015d35e38a (patch) | |
| tree | d63e0e01901f429ba81e23e5fe6be125fb73d54c /sql/sql_plugin.h | |
| parent | e454fb0c9dd768ff7198d177253d9e6fe95511b2 (diff) | |
| download | mariadb-git-2f8849e2aafc9f95390024f35572dc015d35e38a.tar.gz | |
Re'ordering of startup. Fixed Execution path issues. Added function for de'initing everything. This includes Antony's suggestions (bk collapse uber alles!)
sql/handler.cc:
Removed temp work needed for making status variables work with plugins.
sql/mysqld.cc:
Removed call to plugin_load() (not needed any longer).
sql/sql_plugin.cc:
Status vars are now located in only one location (while this fixed execution path problems, we will need to now fix "the name" issues). Monty and I have a solution to this :)
Added function for deiniting engines (before the logic was scattered about).
Added step by step processing for startup of plugins. MyISAM is now loaded first (we will address this long term in a different manner).
sql/sql_plugin.h:
Removed calls that did not need to be extern.
Diffstat (limited to 'sql/sql_plugin.h')
| -rw-r--r-- | sql/sql_plugin.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sql/sql_plugin.h b/sql/sql_plugin.h index df7c9a39495..ed7ba36ac84 100644 --- a/sql/sql_plugin.h +++ b/sql/sql_plugin.h @@ -67,17 +67,14 @@ typedef int (*plugin_type_init)(struct st_plugin_int *); extern char *opt_plugin_dir_ptr; extern char opt_plugin_dir[FN_REFLEN]; extern const LEX_STRING plugin_type_names[]; -extern int plugin_init(void); -extern void plugin_load(void); -extern void plugin_free(void); +extern int plugin_init(int); +extern void plugin_shutdown(void); extern my_bool plugin_is_ready(const LEX_STRING *name, int type); extern st_plugin_int *plugin_lock(const LEX_STRING *name, int type); extern void plugin_unlock(struct st_plugin_int *plugin); extern my_bool mysql_install_plugin(THD *thd, const LEX_STRING *name, const LEX_STRING *dl); extern my_bool mysql_uninstall_plugin(THD *thd, const LEX_STRING *name); -extern my_bool plugin_register_builtin(struct st_mysql_plugin *plugin); - typedef my_bool (plugin_foreach_func)(THD *thd, st_plugin_int *plugin, void *arg); |