summaryrefslogtreecommitdiff
path: root/sql/sql_plugin.cc
diff options
context:
space:
mode:
authorserg@sergbook.mysql.com <>2007-04-29 08:24:33 -0700
committerserg@sergbook.mysql.com <>2007-04-29 08:24:33 -0700
commit960f009a349f51bea32d08b13d59bd2ba73ebf8a (patch)
tree157ed382b088d48fe8c3eebabaf9cb14e996ee15 /sql/sql_plugin.cc
parent4f8e86db404d3f863e81bb314d52191a2464a38f (diff)
downloadmariadb-git-960f009a349f51bea32d08b13d59bd2ba73ebf8a.tar.gz
compilation error
Diffstat (limited to 'sql/sql_plugin.cc')
-rw-r--r--sql/sql_plugin.cc8
1 files changed, 3 insertions, 5 deletions
diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc
index 24ccb9e0a3b..b26ae0e070d 100644
--- a/sql/sql_plugin.cc
+++ b/sql/sql_plugin.cc
@@ -1151,10 +1151,8 @@ int plugin_init(int *argc, char **argv, int flags)
if (is_myisam)
{
DBUG_ASSERT(!global_system_variables.table_plugin);
- 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;
- 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);
}
}
@@ -1436,7 +1434,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");