summaryrefslogtreecommitdiff
path: root/include/mysql
diff options
context:
space:
mode:
authorunknown <antony@ppcg5.local>2007-03-28 21:29:16 -0700
committerunknown <antony@ppcg5.local>2007-03-28 21:29:16 -0700
commit212ba963f2a160df9ac5be747a5c32741f81803a (patch)
tree614efd391bffdfd696afac5ccb537757bb235ee2 /include/mysql
parenteac12b6587c53d34f0241c404fb0ce8c5ee0da93 (diff)
downloadmariadb-git-212ba963f2a160df9ac5be747a5c32741f81803a.tar.gz
WL#2936
"Plugin Server Variables" Post review cleanups. 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
Diffstat (limited to 'include/mysql')
-rw-r--r--include/mysql/plugin.h10
1 files changed, 6 insertions, 4 deletions
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)