diff options
| author | Igor Babaev <igor@askmonty.org> | 2017-08-14 17:05:41 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2017-08-14 17:06:11 -0700 |
| commit | 596bdc2dbe5c81303e9dca3e27f070edd7bfa92f (patch) | |
| tree | 8f770966588cb89210239fb42804cd72cb8dfc67 /sql/sys_vars.ic | |
| parent | 9d853230077a97db819abc69a9197ab0b5f5aff2 (diff) | |
| download | mariadb-git-596bdc2dbe5c81303e9dca3e27f070edd7bfa92f.tar.gz | |
Changed the function my_set_bits() to return uint64 instead of uint32.
Corrected an assertion in the constructor for the class Sys_var_flagset.
Diffstat (limited to 'sql/sys_vars.ic')
| -rw-r--r-- | sql/sys_vars.ic | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sys_vars.ic b/sql/sys_vars.ic index f9acfb3b657..ade2928f4c2 100644 --- a/sql/sys_vars.ic +++ b/sql/sys_vars.ic @@ -1230,7 +1230,7 @@ public: global_var(ulonglong)= def_val; SYSVAR_ASSERT(typelib.count > 1); SYSVAR_ASSERT(typelib.count <= 65); - SYSVAR_ASSERT(def_val < my_set_bits(typelib.count)); + SYSVAR_ASSERT(def_val <= my_set_bits(typelib.count-1)); SYSVAR_ASSERT(strcmp(values[typelib.count-1], "default") == 0); SYSVAR_ASSERT(size == sizeof(ulonglong)); } |