summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorGeorgi Kodinov <Georgi.Kodinov@Oracle.com>2010-08-03 19:01:30 +0300
committerGeorgi Kodinov <Georgi.Kodinov@Oracle.com>2010-08-03 19:01:30 +0300
commit5eeb6488cf3973c3821aef10d40ed221985f9190 (patch)
treeea6251ab5067de2f16859c5fba5e0da34d11b2f2 /include
parent60ab046abc82f75a174bf2ed19ef631a1a2e059a (diff)
downloadmariadb-git-5eeb6488cf3973c3821aef10d40ed221985f9190.tar.gz
Bug #42144: plugin_load fails
The enum system variables were handled inconsistently as ints, unsigned int and unsigned long on various places. This caused problems on platforms on which sizeof(int) != sizeof(long). Fixed by homogenizing the type of the enum variables to unsigned int, since it's size compatible with the C enum type. Removed the test from the experimental list.
Diffstat (limited to 'include')
-rw-r--r--include/mysql/plugin.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/mysql/plugin.h b/include/mysql/plugin.h
index 55ef6070f85..c2ca8a0f94e 100644
--- a/include/mysql/plugin.h
+++ b/include/mysql/plugin.h
@@ -318,7 +318,7 @@ DECLARE_MYSQL_SYSVAR_SIMPLE(name, unsigned long long) = { \
#name, comment, check, update, &varname, def, min, max, blk }
#define MYSQL_SYSVAR_ENUM(name, varname, opt, comment, check, update, def, typelib) \
-DECLARE_MYSQL_SYSVAR_TYPELIB(name, unsigned long) = { \
+DECLARE_MYSQL_SYSVAR_TYPELIB(name, unsigned int) = { \
PLUGIN_VAR_ENUM | ((opt) & PLUGIN_VAR_MASK), \
#name, comment, check, update, &varname, def, typelib }