summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorGeorgi Kodinov <Georgi.Kodinov@Oracle.com>2010-08-04 15:58:09 +0300
committerGeorgi Kodinov <Georgi.Kodinov@Oracle.com>2010-08-04 15:58:09 +0300
commitb1a8b3aa6eb3f8f8c2df218e4eb25e4af710b66a (patch)
tree6d1cee70a8b083af4c8fb88a8fc9091d6e1e051e /include
parent5eeb6488cf3973c3821aef10d40ed221985f9190 (diff)
downloadmariadb-git-b1a8b3aa6eb3f8f8c2df218e4eb25e4af710b66a.tar.gz
Bug #42144: plugin_load fails
Reverted the ulong->uint diff Re-applied the first diff. The original commit message follows: enum plugin system variables are ulong internally, not int. On systems where long is not the same as an int it causes problems. Fixed by correct typecasting. 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 c2ca8a0f94e..55ef6070f85 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 int) = { \
+DECLARE_MYSQL_SYSVAR_TYPELIB(name, unsigned long) = { \
PLUGIN_VAR_ENUM | ((opt) & PLUGIN_VAR_MASK), \
#name, comment, check, update, &varname, def, typelib }