diff options
| author | Alexander Barkov <bar@mariadb.org> | 2014-09-01 20:57:32 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2014-09-01 20:57:32 +0400 |
| commit | 1427e1db99ac44dedbc78e8655742a8ed9bfd755 (patch) | |
| tree | a848c06ceed3a3a7a69e6ce159f92d2c3f96c5f0 /sql/item_strfunc.h | |
| parent | 18b307a7d23fd59b4a831e3e95207e2e34f56b6e (diff) | |
| download | mariadb-git-1427e1db99ac44dedbc78e8655742a8ed9bfd755.tar.gz | |
MDEV-6661 PI() does not work well in UCS2/UTF16/UTF32 context
MDEV-6666 Malformed result for CONCAT(utf8_column, binary_string)
Item_static_string_func::safe_charset_converter() and
Item_hex_string::safe_charset_converter() did not
handle character sets with mbminlen>1 properly, as well as
did not handle conversion from binary to multi-byte well.
Introducing Item::const_charset_converter(), to reuse it in a number
of Item_*::safe_charset_converter().
Diffstat (limited to 'sql/item_strfunc.h')
| -rw-r--r-- | sql/item_strfunc.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/item_strfunc.h b/sql/item_strfunc.h index 4551cc1ab46..01a88e229d5 100644 --- a/sql/item_strfunc.h +++ b/sql/item_strfunc.h @@ -542,7 +542,10 @@ class Item_func_sysconst :public Item_str_func public: Item_func_sysconst() { collation.set(system_charset_info,DERIVATION_SYSCONST); } - Item *safe_charset_converter(CHARSET_INFO *tocs); + Item *safe_charset_converter(CHARSET_INFO *tocs) + { + return const_charset_converter(tocs, true, fully_qualified_func_name()); + } /* Used to create correct Item name in new converted item in safe_charset_converter, return string representation of this function |