Commit 28feb893 authored by serg@sergbook.mysql.com's avatar serg@sergbook.mysql.com

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines

into  sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.1-wl2936
parents cfa3f910 960f009a
...@@ -657,7 +657,7 @@ char *thd_security_context(MYSQL_THD thd, char *buffer, unsigned int length, ...@@ -657,7 +657,7 @@ char *thd_security_context(MYSQL_THD thd, char *buffer, unsigned int length,
#ifdef __cplusplus #ifdef __cplusplus
}; }
#endif #endif
#endif #endif
......
...@@ -1151,14 +1151,8 @@ int plugin_init(int *argc, char **argv, int flags) ...@@ -1151,14 +1151,8 @@ int plugin_init(int *argc, char **argv, int flags)
if (is_myisam) if (is_myisam)
{ {
DBUG_ASSERT(!global_system_variables.table_plugin); DBUG_ASSERT(!global_system_variables.table_plugin);
#ifdef DBUG_OFF global_system_variables.table_plugin=
global_system_variables.table_plugin= plugin_ptr; my_intern_plugin_lock(NULL, plugin_int_to_ref(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++;
DBUG_ASSERT(plugin_ptr->ref_count == 1); DBUG_ASSERT(plugin_ptr->ref_count == 1);
} }
} }
...@@ -1441,7 +1435,7 @@ error: ...@@ -1441,7 +1435,7 @@ error:
void plugin_shutdown(void) 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_int **plugins, *plugin;
struct st_plugin_dl **dl; struct st_plugin_dl **dl;
DBUG_ENTER("plugin_shutdown"); DBUG_ENTER("plugin_shutdown");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment