diff options
| author | unknown <bar@bar.mysql.r18.ru> | 2003-05-23 10:45:46 +0500 |
|---|---|---|
| committer | unknown <bar@bar.mysql.r18.ru> | 2003-05-23 10:45:46 +0500 |
| commit | 5d4fbc021a0bba300f85c0136a467e6961af5555 (patch) | |
| tree | 9cf7ca218ba396f6b8fea51d4289850601b748a5 /sql/item_strfunc.cc | |
| parent | 46c730e62cd02a6e68aded98e03d633c14e61f3b (diff) | |
| download | mariadb-git-5d4fbc021a0bba300f85c0136a467e6961af5555.tar.gz | |
Automatic conversion into supersets (utf8, ucs2) for comparison in some cases
USER(), DATABASE() and VERSION() return in utf8 now
Diffstat (limited to 'sql/item_strfunc.cc')
| -rw-r--r-- | sql/item_strfunc.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc index dd48314596b..078e3f213a0 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -1459,10 +1459,12 @@ String *Item_func_database::val_str(String *str) { THD *thd= current_thd; if (!thd->db) + { str->length(0); + str->set_charset(system_charset_info); + } else - str->copy((const char*) thd->db,(uint) strlen(thd->db), - system_charset_info, default_charset()); + str->copy((const char*) thd->db,(uint) strlen(thd->db),system_charset_info); return str; } @@ -1471,7 +1473,7 @@ String *Item_func_database::val_str(String *str) String *Item_func_user::val_str(String *str) { THD *thd=current_thd; - CHARSET_INFO *cs= default_charset(); + CHARSET_INFO *cs= system_charset_info; const char *host= thd->host_or_ip; uint res_length; |