diff options
| author | Alexey Botchkov <holyfoot@askmonty.org> | 2017-09-13 15:17:28 +0400 |
|---|---|---|
| committer | Alexey Botchkov <holyfoot@askmonty.org> | 2017-09-13 15:17:28 +0400 |
| commit | dc82f70e9f203fb6cd2e9dd2b43beb1a2d6e791e (patch) | |
| tree | 012b419628f2b1b54755e21b0cbf00f5c4151091 /sql/item_jsonfunc.cc | |
| parent | a237a920991f417e9a4567957f4fc7aa5b538270 (diff) | |
| download | mariadb-git-dc82f70e9f203fb6cd2e9dd2b43beb1a2d6e791e.tar.gz | |
MDEV-13633 JSON_ARRAY() - bad output with some UTF8 characters.
set_charset() calls added for Item_func_json_arran
and Item_func_json_object::val_str-s.
Diffstat (limited to 'sql/item_jsonfunc.cc')
| -rw-r--r-- | sql/item_jsonfunc.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/item_jsonfunc.cc b/sql/item_jsonfunc.cc index a39b5f3f263..6398929defc 100644 --- a/sql/item_jsonfunc.cc +++ b/sql/item_jsonfunc.cc @@ -1473,6 +1473,7 @@ String *Item_func_json_array::val_str(String *str) uint n_arg; str->length(0); + str->set_charset(collation.collation); if (str->append("[", 1) || ((arg_count > 0) && append_json_value(str, args[0], &tmp_val))) @@ -1797,6 +1798,7 @@ String *Item_func_json_object::val_str(String *str) uint n_arg; str->length(0); + str->set_charset(collation.collation); if (str->append("{", 1) || (arg_count > 0 && |