diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-09-14 08:09:44 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-09-14 08:09:44 +0300 |
| commit | c97e504a5fa470c7ee4717f1e38ce12b61174741 (patch) | |
| tree | 5cfe4c45f1f8226b940abd46d0a428124cf8d269 /sql/item_jsonfunc.cc | |
| parent | 178540b904f3eca70488a3d1a0a55f5676087c04 (diff) | |
| parent | cfd51c01e17cd2689764a6c47de1e218adf9aaec (diff) | |
| download | mariadb-git-c97e504a5fa470c7ee4717f1e38ce12b61174741.tar.gz | |
Merge 10.2 into bb-10.2-ext
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 4585427b442..27d5cea3652 100644 --- a/sql/item_jsonfunc.cc +++ b/sql/item_jsonfunc.cc @@ -1474,6 +1474,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))) @@ -1798,6 +1799,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 && |