diff options
author | Michael Widenius <monty@askmonty.org> | 2014-02-05 19:23:11 +0200 |
---|---|---|
committer | Michael Widenius <monty@askmonty.org> | 2014-02-05 19:23:11 +0200 |
commit | 10001c8e4f4bf08b3c491dce2714e13cca667890 (patch) | |
tree | 738ffc405ffa9a11753f7b9a781f244dc270f803 /sql/set_var.h | |
parent | f68eac2eadb9bdb3d9c3554b37d6c253f04562d2 (diff) | |
parent | 5426facdcbfba2d78dab3c709cbf278073383b7c (diff) | |
download | mariadb-git-10001c8e4f4bf08b3c491dce2714e13cca667890.tar.gz |
Automatic merge
Diffstat (limited to 'sql/set_var.h')
-rw-r--r-- | sql/set_var.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sql/set_var.h b/sql/set_var.h index a6c3b9daccd..88c5013e28e 100644 --- a/sql/set_var.h +++ b/sql/set_var.h @@ -60,7 +60,7 @@ public: sys_var *next; LEX_CSTRING name; enum flag_enum { GLOBAL, SESSION, ONLY_SESSION, SCOPE_MASK=1023, - READONLY=1024, ALLOCATED=2048, PARSE_EARLY=4096 }; + READONLY=1024, ALLOCATED=2048, PARSE_EARLY=4096, SHOW_VALUE_IN_HELP=8192 }; /** Enumeration type to indicate for a system variable whether it will be written to the binlog or not. @@ -142,8 +142,9 @@ public: } bool register_option(DYNAMIC_ARRAY *array, int parse_flags) { - return (option.id != -1) && ((flags & PARSE_EARLY) == parse_flags) && - insert_dynamic(array, (uchar*)&option); + return ((((option.id != -1) && ((flags & PARSE_EARLY) == parse_flags)) || + (flags & parse_flags)) && + insert_dynamic(array, (uchar*)&option)); } void do_deprecated_warning(THD *thd); |