diff options
| author | unknown <serg@sergbook.mysql.com> | 2007-04-29 08:29:18 -0700 |
|---|---|---|
| committer | unknown <serg@sergbook.mysql.com> | 2007-04-29 08:29:18 -0700 |
| commit | c73135fd83f5eb391f4bdd0cd59329baa194f17e (patch) | |
| tree | e555bd0f25c1c3f675d18b38e98443ea91ecd8a6 /sql/sql_plugin.cc | |
| parent | 53015163679cf8c8a8c7f7b12cc4b72970f896a1 (diff) | |
| parent | 91673114656c32ba201ac04b9ecd2388bacd2e64 (diff) | |
| download | mariadb-git-c73135fd83f5eb391f4bdd0cd59329baa194f17e.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.1-wl2936
sql/sql_plugin.cc:
merged
Diffstat (limited to 'sql/sql_plugin.cc')
| -rw-r--r-- | sql/sql_plugin.cc | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc index c0feff3f1ed..cffba604dfd 100644 --- a/sql/sql_plugin.cc +++ b/sql/sql_plugin.cc @@ -1151,14 +1151,8 @@ int plugin_init(int *argc, char **argv, int flags) if (is_myisam) { DBUG_ASSERT(!global_system_variables.table_plugin); -#ifdef DBUG_OFF - global_system_variables.table_plugin= plugin_ptr; -#else - global_system_variables.table_plugin= (plugin_ref) - my_malloc(sizeof(plugin_ptr), MYF(MY_WME | MY_FAE)); - global_system_variables.table_plugin[0]= plugin_ptr; -#endif - plugin_ptr->ref_count++; + global_system_variables.table_plugin= + my_intern_plugin_lock(NULL, plugin_int_to_ref(plugin_ptr)); DBUG_ASSERT(plugin_ptr->ref_count == 1); } } @@ -1441,7 +1435,7 @@ error: void plugin_shutdown(void) { - uint i, count= plugin_array.elements, free_slots; + uint i, count= plugin_array.elements, free_slots= 0; struct st_plugin_int **plugins, *plugin; struct st_plugin_dl **dl; DBUG_ENTER("plugin_shutdown"); |