From 212ba963f2a160df9ac5be747a5c32741f81803a Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 28 Mar 2007 21:29:16 -0700 Subject: WL#2936 "Plugin Server Variables" Post review cleanups. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit include/mysql/plugin.h: WL2936 post review clean up fix macros to ensure correct type declarations sql/ha_partition.cc: WL2936 post review clean up add in missing my_afree() sql/handler.cc: WL2936 post review clean up remove stray semicolon sql/sql_plugin.cc: WL2936 post review clean up fixup comments and debug code storage/innobase/handler/ha_innodb.cc: WL2936 Include some of Marko Mäkelä's patches storage/innobase/handler/ha_innodb.h: WL2936 Include some of Marko Mäkelä's patches --- include/mysql/plugin.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'include/mysql') diff --git a/include/mysql/plugin.h b/include/mysql/plugin.h index 200b23cc93d..ef4392a485c 100644 --- a/include/mysql/plugin.h +++ b/include/mysql/plugin.h @@ -193,13 +193,14 @@ typedef void (*mysql_var_update_func)(MYSQL_THD thd, #define DECLARE_MYSQL_SYSVAR_BASIC(name, type) struct { \ MYSQL_PLUGIN_VAR_HEADER; \ - type *value, def_val; \ + type *value; type def_val; \ } MYSQL_SYSVAR_NAME(name) #define DECLARE_MYSQL_SYSVAR_SIMPLE(name, type) struct { \ MYSQL_PLUGIN_VAR_HEADER; \ - type *value, def_val, min_val,\ - max_val, blk_sz; \ + type *value; type def_val; \ + type min_val; type max_val; \ + type blk_sz; \ } MYSQL_SYSVAR_NAME(name) #define DECLARE_MYSQL_SYSVAR_TYPELIB(name) struct { \ @@ -221,7 +222,8 @@ typedef void (*mysql_var_update_func)(MYSQL_THD thd, #define DECLARE_MYSQL_THDVAR_SIMPLE(name, type) struct { \ MYSQL_PLUGIN_VAR_HEADER; \ int offset; \ - type def_val, min_val, max_val, blk_sz; \ + type def_val; type min_val; \ + type max_val; type blk_sz; \ DECLARE_THDVAR_FUNC(type); \ } MYSQL_SYSVAR_NAME(name) -- cgit v1.2.1