diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-12-13 23:14:15 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-12-14 08:40:01 +0200 |
commit | ece9c54e1062ea70b8cf31d69c1ce4db9ba12f7d (patch) | |
tree | 7f7fd7ea472ff807629fd5abe3a540072307fc49 /sql/item_cmpfunc.cc | |
parent | 58eb4e5db9e333768cc927d5d5a63d68fbd74548 (diff) | |
parent | 7be5b6f0e6170461e7ccc6ec7947436af2e43e41 (diff) | |
download | mariadb-git-ece9c54e1062ea70b8cf31d69c1ce4db9ba12f7d.tar.gz |
Merge 10.1 into 10.2
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 1b84cd89cf9..38593a52495 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -6976,20 +6976,20 @@ 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(); } else { - uint strlen= nm->length() * my_charset_utf8_general_ci.mbmaxlen + 1; + uint strlen= nm->length() * DYNCOL_UTF->mbmaxlen + 1; uint dummy_errors; buf.str= (char *) current_thd->alloc(strlen); 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); } |