From bd6afd8b5e21c10a3bd84a5073bbe427015fac07 Mon Sep 17 00:00:00 2001 From: Alexander Barkov Date: Fri, 13 Mar 2020 15:22:02 +0400 Subject: MDEV-21956 Add class Sys_var_charptr_fscs Simplifying definitions on Sys_var_charptr*: - Removing sys_var::is_os_charset - Adding a new class Sys_var_charptr_fscs, to handle system variables with character_set_filesystem. --- sql/set_var.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'sql/set_var.h') diff --git a/sql/set_var.h b/sql/set_var.h index 075339c4f38..1573965885f 100644 --- a/sql/set_var.h +++ b/sql/set_var.h @@ -90,7 +90,6 @@ protected: on_check_function on_check; on_update_function on_update; const char *const deprecation_substitute; - bool is_os_charset; ///< true if the value is in character_set_filesystem public: sys_var(sys_var_chain *chain, const char *name_arg, const char *comment, @@ -130,7 +129,10 @@ public: SHOW_TYPE show_type() { return show_val_type; } int scope() const { return flags & SCOPE_MASK; } - CHARSET_INFO *charset(THD *thd); + virtual CHARSET_INFO *charset(THD *thd) const + { + return system_charset_info; + } bool is_readonly() const { return flags & READONLY; } /** the following is only true for keycache variables, -- cgit v1.2.1