diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-09-03 18:06:55 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-09-04 10:33:56 +0200 |
| commit | bc12d5fd4382ad021b77a875d4b7dbd5f2c38d1c (patch) | |
| tree | ed6ce95f6ee9ff57b45c494d10f5a19473237e96 /sql/set_var.h | |
| parent | e3982cead235e9becb1abdbf0e73876c8a6e6b28 (diff) | |
| download | mariadb-git-bc12d5fd4382ad021b77a875d4b7dbd5f2c38d1c.tar.gz | |
MDEV-6066: Merge new defaults from 5.6 and 5.7
cosmetic fixes. test fixes.
Diffstat (limited to 'sql/set_var.h')
| -rw-r--r-- | sql/set_var.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/sql/set_var.h b/sql/set_var.h index b3538559fbb..43ad7f509d8 100644 --- a/sql/set_var.h +++ b/sql/set_var.h @@ -89,12 +89,6 @@ protected: const char *const deprecation_substitute; bool is_os_charset; ///< true if the value is in character_set_filesystem - inline void fix_auto_flag() - { - if (flags & AUTO_SET) - option.var_type|= GET_AUTO; - } - public: sys_var(sys_var_chain *chain, const char *name_arg, const char *comment, int flag_args, ptrdiff_t off, int getopt_id, |