summaryrefslogtreecommitdiff
path: root/sql/sys_vars.ic
diff options
context:
space:
mode:
authorAlexey Botchkov <holyfoot@askmonty.org>2018-06-20 22:45:10 +0400
committerAlexey Botchkov <holyfoot@askmonty.org>2018-06-20 22:45:10 +0400
commitbe9d923af2b1b9bfe4ce3e2cf06ead957cf6129c (patch)
tree9e29e16734e6e2b0f8d015f5b72cf3ae2a59bf3a /sql/sys_vars.ic
parent621caad3ca007f84ae3d9216b8a23219b334347e (diff)
downloadmariadb-git-be9d923af2b1b9bfe4ce3e2cf06ead957cf6129c.tar.gz
MDEV-11917 enum/set command-line options aren't respecting max-* settings.
my_option strucures for command-line variables should be set properly.
Diffstat (limited to 'sql/sys_vars.ic')
-rw-r--r--sql/sys_vars.ic4
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/sys_vars.ic b/sql/sys_vars.ic
index b92867f98e1..ffd08608e19 100644
--- a/sql/sys_vars.ic
+++ b/sql/sys_vars.ic
@@ -341,6 +341,8 @@ public:
substitute)
{
option.var_type|= GET_ENUM;
+ option.min_value= 0;
+ option.max_value= ULONG_MAX;
global_var(ulong)= def_val;
if ((option.u_max_value= (uchar**)max_var_ptr()))
{
@@ -1349,6 +1351,8 @@ public:
substitute)
{
option.var_type|= GET_SET;
+ option.min_value= 0;
+ option.max_value= ~0ULL;
global_var(ulonglong)= def_val;
if ((option.u_max_value= (uchar**)max_var_ptr()))
{