diff options
author | acurtis/antony@xiphis.org/ltamd64.xiphis.org <> | 2007-05-01 18:25:29 -0700 |
---|---|---|
committer | acurtis/antony@xiphis.org/ltamd64.xiphis.org <> | 2007-05-01 18:25:29 -0700 |
commit | 9126286a6a43d100ada3070042a76368a0e84e25 (patch) | |
tree | 1df07565eb5375479d3b4f10b9372c76d7bce56e /include | |
parent | a2e63487e8e9352ce64ef14be6ac203854eb570a (diff) | |
download | mariadb-git-9126286a6a43d100ada3070042a76368a0e84e25.tar.gz |
WL#2936
Fix compiler warnings,
Fix help output - this fixes im test failures.
Fix incomplete change of SET plugin vars to ulonglong.
Allow ER() to work without crashing when errmsg.sys has not been loaded.
Diffstat (limited to 'include')
-rw-r--r-- | include/mysql/plugin.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/mysql/plugin.h b/include/mysql/plugin.h index fd43e9688d0..7b224695324 100644 --- a/include/mysql/plugin.h +++ b/include/mysql/plugin.h @@ -193,7 +193,8 @@ typedef void (*mysql_var_update_func)(MYSQL_THD thd, #define DECLARE_MYSQL_SYSVAR_BASIC(name, type) struct { \ MYSQL_PLUGIN_VAR_HEADER; \ - type *value; type def_val; \ + type *value; \ + const type def_val; \ } MYSQL_SYSVAR_NAME(name) #define DECLARE_MYSQL_SYSVAR_SIMPLE(name, type) struct { \ @@ -215,7 +216,7 @@ typedef void (*mysql_var_update_func)(MYSQL_THD thd, #define DECLARE_MYSQL_THDVAR_BASIC(name, type) struct { \ MYSQL_PLUGIN_VAR_HEADER; \ int offset; \ - type def_val; \ + const type def_val; \ DECLARE_THDVAR_FUNC(type); \ } MYSQL_SYSVAR_NAME(name) |