database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

compilation error

Browse Source
This commit is contained in:
serg@sergbook.mysql.com
2007-04-29 08:24:33 -07:00
parent 4f8e86db40
commit 960f009a34
2 changed files with 4 additions and 6 deletions
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 #ifdef __cplusplus
}; }
#endif #endif
#endif #endif

8
sql/sql_plugin.cc
View File

@ -1151,10 +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);
global_system_variables.table_plugin= (plugin_ref) global_system_variables.table_plugin=
my_malloc(sizeof(plugin_ptr), MYF(MY_WME | MY_FAE)); my_intern_plugin_lock(NULL, plugin_int_to_ref(plugin_ptr));
global_system_variables.table_plugin[0]= plugin_ptr;
plugin_ptr->ref_count++;
DBUG_ASSERT(plugin_ptr->ref_count == 1); DBUG_ASSERT(plugin_ptr->ref_count == 1);
} }
} }
@ -1436,7 +1434,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");