summaryrefslogtreecommitdiff
path: root/sql/item_jsonfunc.cc
diff options
context:
space:
mode:
authorAlexey Botchkov <holyfoot@askmonty.org>2018-08-05 18:33:17 +0400
committerAlexey Botchkov <holyfoot@askmonty.org>2018-08-05 18:33:17 +0400
commitfc324a5f87827e43f51d1a75e60b3d5abcd807e5 (patch)
tree161807244d2819c97179389742f67cabfb4d737e /sql/item_jsonfunc.cc
parentaffdd79c69dfe443cb9fda06ef156243e1967ac3 (diff)
downloadmariadb-git-fc324a5f87827e43f51d1a75e60b3d5abcd807e5.tar.gz
MDEV-16869 String functions don't respect character set of JSON_VALUE.
Item_func_json_value::val_str() produced string of wrong charset.
Diffstat (limited to 'sql/item_jsonfunc.cc')
-rw-r--r--sql/item_jsonfunc.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_jsonfunc.cc b/sql/item_jsonfunc.cc
index ac0d7e9e6b0..e9d38b78843 100644
--- a/sql/item_jsonfunc.cc
+++ b/sql/item_jsonfunc.cc
@@ -479,7 +479,7 @@ String *Item_func_json_value::val_str(String *str)
(const uchar *) js->ptr() + js->length());
str->length(0);
- str->set_charset(&my_charset_utf8mb4_bin);
+ str->set_charset(collation.collation);
path.cur_step= path.p.steps;
continue_search: