diff options
| author | unknown <gluh@eagle.intranet.mysql.r18.ru> | 2005-09-07 15:38:09 +0500 |
|---|---|---|
| committer | unknown <gluh@eagle.intranet.mysql.r18.ru> | 2005-09-07 15:38:09 +0500 |
| commit | a777907a51510cec8ab4a502d0924e072b47665d (patch) | |
| tree | 855fc99c7e2d4560cf60d1f78a825e07e0c8dadd /sql/set_var.h | |
| parent | 44b35dbb0e98f02286121b7b8738027d65256004 (diff) | |
| download | mariadb-git-a777907a51510cec8ab4a502d0924e072b47665d.tar.gz | |
Fix for bug#11775 Variable character_set_system does not exist (sometimes).
Variable character_set_system is selectable now
More accurate error message results during
update of character_set_system and some other read only variables
mysql-test/r/variables.result:
Fix for bug#11775 Variable character_set_system does not exist (sometimes).
test case
mysql-test/t/variables.test:
Fix for bug#11775 Variable character_set_system does not exist (sometimes).
test case
Diffstat (limited to 'sql/set_var.h')
| -rw-r--r-- | sql/set_var.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/set_var.h b/sql/set_var.h index c8b075ddd35..40ff4c8583f 100644 --- a/sql/set_var.h +++ b/sql/set_var.h @@ -190,6 +190,7 @@ public: return 1; } bool check_default(enum_var_type type) { return 1; } + bool is_readonly() const { return 1; } }; @@ -900,7 +901,7 @@ int sql_set_variables(THD *thd, List<set_var_base> *var_list); bool not_all_support_one_shot(List<set_var_base> *var_list); void fix_delay_key_write(THD *thd, enum_var_type type); ulong fix_sql_mode(ulong sql_mode); -extern sys_var_str sys_charset_system; +extern sys_var_const_str sys_charset_system; extern sys_var_str sys_init_connect; extern sys_var_str sys_init_slave; extern sys_var_thd_time_zone sys_time_zone; |