mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 21:12:26 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
into  sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.1-wl2936
This commit is contained in:
serg@sergbook.mysql.com 2007-04-29 08:29:18 -07:00
commit 28feb8937d
2 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/mysql/plugin.h
View file

@ -657,7 +657,7 @@ char *thd_security_context(MYSQL_THD thd, char *buffer, unsigned int length,
#ifdef __cplusplus
};
}
#endif
#endif

12
sql/sql_plugin.cc
View file

@ -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");