diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2017-11-13 16:30:02 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2017-11-13 16:30:02 +0100 |
| commit | e22c33e3f014ffc4d7c08d6830f710c19f1aff90 (patch) | |
| tree | daa77e98a9e0fd9d50de450fcaaa0b927d0b009e /sql/item_cmpfunc.cc | |
| parent | c0e10f375ad619d825ef7c21232cf5946bdf5be7 (diff) | |
| download | mariadb-git-bb-10.0-MDEV-8949.tar.gz | |
MDEV-8949: COLUMN_CREATE unicode name breakagebb-10.0-MDEV-8949
Use utf-mb4 if it is possible.
Diffstat (limited to 'sql/item_cmpfunc.cc')
| -rw-r--r-- | sql/item_cmpfunc.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc index b086b084f97..807ce828131 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -6642,7 +6642,7 @@ longlong Item_func_dyncol_exists::val_int() null_value= 1; return 1; } - if (my_charset_same(nm->charset(), &my_charset_utf8_general_ci)) + if (my_charset_same(nm->charset(), DYNCOL_UTF)) { buf.str= (char *) nm->ptr(); buf.length= nm->length(); @@ -6652,11 +6652,11 @@ longlong Item_func_dyncol_exists::val_int() uint strlen; uint dummy_errors; buf.str= (char *)sql_alloc((strlen= nm->length() * - my_charset_utf8_general_ci.mbmaxlen + 1)); + DYNCOL_UTF->mbmaxlen + 1)); if (buf.str) { buf.length= - copy_and_convert(buf.str, strlen, &my_charset_utf8_general_ci, + copy_and_convert(buf.str, strlen, DYNCOL_UTF, nm->ptr(), nm->length(), nm->charset(), &dummy_errors); } |