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.cc | |
| 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.cc')
| -rw-r--r-- | sql/set_var.cc | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index 551b92012d1..b2cc41b2d15 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -154,8 +154,7 @@ sys_var::sys_var(sys_var_chain *chain, const char *name_arg, next(0), binlog_status(binlog_status_arg), value_origin(COMPILE_TIME), flags(flags_arg), show_val_type(show_val_type_arg), guard(lock), offset(off), on_check(on_check_func), on_update(on_update_func), - deprecation_substitute(substitute), - is_os_charset(FALSE) + deprecation_substitute(substitute) { /* There is a limitation in handle_options() related to short options: @@ -509,12 +508,6 @@ bool throw_bounds_warning(THD *thd, const char *name, bool fixed, double v) return false; } -CHARSET_INFO *sys_var::charset(THD *thd) -{ - return is_os_charset ? thd->variables.character_set_filesystem : - system_charset_info; -} - typedef struct old_names_map_st { |