From 94fdba3302b96f0ee16b4a7c69e4c9fc512da444 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 2 Apr 2007 11:38:58 -0700 Subject: WL#2936 "Plugin Server Variables" Post review cleanups. sql/mysql_priv.h: WL2936 move where sql_plugin.h is included earlier so that plugin_ref declaration is available to sql/structs.h sql/sql_class.cc: WL2936 cleanup remove lock_locals argument for plugin_thdvar_init() sql/sql_connect.cc: WL2936 cleanup redundant call to plugin_thdvar_init() sql/sql_plugin.cc: WL2936 cleanup remove lock_locals argument for plugin_thdvar_init() renamed st_bookmark member from 'name' to 'key'. split cleanup_variables() and remove free_memory argument. sql/sql_plugin.h: WL2936 cleanup remove lock_locals argument for plugin_thdvar_init() sql/structs.h: WL2936 cleanup remove ugly conditional compilation, use plugin_ref --- sql/structs.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'sql/structs.h') diff --git a/sql/structs.h b/sql/structs.h index 3c08b5a3de1..f55a9757011 100644 --- a/sql/structs.h +++ b/sql/structs.h @@ -83,11 +83,7 @@ typedef struct st_key { */ union { -#ifdef DBUG_OFF - struct st_plugin_int *parser; /* Fulltext [pre]parser */ -#else - struct st_plugin_int **parser; /* Fulltext [pre]parser */ -#endif + plugin_ref parser; /* Fulltext [pre]parser */ LEX_STRING *parser_name; /* Fulltext [pre]parser name */ }; KEY_PART_INFO *key_part; -- cgit v1.2.1