diff options
| author | unknown <bar@mysql.com> | 2005-06-02 16:17:44 +0500 |
|---|---|---|
| committer | unknown <bar@mysql.com> | 2005-06-02 16:17:44 +0500 |
| commit | 17678a7b885beb59fa808b7ace5cee4a0e21667d (patch) | |
| tree | ba349e96ee75c58e59e1948f4216483c5713080c /sql/set_var.cc | |
| parent | d7d3be6b16ebb63d84b39cf109153becf8f08786 (diff) | |
| download | mariadb-git-17678a7b885beb59fa808b7ace5cee4a0e21667d.tar.gz | |
item_func.cc:
set_var.cc:
variables.result
variables.test
Bug #10904 Illegal mix of collations between a system variable and a constant
Changing coercibility of system variables to SYSCONST,
to be the same with USER(), DATABASE(), etc.
sql/item_func.cc:
Bug #10904 Illegal mix of collations between a system variable and a constant
Changing coercibility of system variables to SYSCONST
To be the same with USER(), DATABASE(), etc.
Diffstat (limited to 'sql/set_var.cc')
| -rw-r--r-- | sql/set_var.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index b006dde2b4b..5564ba096ac 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -1606,7 +1606,8 @@ Item *sys_var::item(THD *thd, enum_var_type var_type, LEX_STRING *base) Item_string *tmp; pthread_mutex_lock(&LOCK_global_system_variables); char *str= (char*) value_ptr(thd, var_type, base); - tmp= new Item_string(str, strlen(str), system_charset_info); + tmp= new Item_string(str, strlen(str), + system_charset_info, DERIVATION_SYSCONST); pthread_mutex_unlock(&LOCK_global_system_variables); return tmp; } |