diff options
| author | Alexander Barkov <bar@mariadb.com> | 2020-03-13 15:22:02 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.com> | 2020-03-17 07:44:23 +0400 |
| commit | bd6afd8b5e21c10a3bd84a5073bbe427015fac07 (patch) | |
| tree | 5dbf4b2b2bdc98eea5c59928cf79bf722ad4328f /sql/set_var.h | |
| parent | 9cc7edb1cfc3297288f35f63bf3666984cbf9614 (diff) | |
| download | mariadb-git-bd6afd8b5e21c10a3bd84a5073bbe427015fac07.tar.gz | |
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.
Diffstat (limited to 'sql/set_var.h')
| -rw-r--r-- | sql/set_var.h | 6 |
1 files changed, 4 insertions, 2 deletions
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, |