diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-08-12 11:47:16 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-08-12 12:02:23 +0200 |
| commit | 0aa9b03393f515d7b07c3139756c2a9270501c97 (patch) | |
| tree | 074514d29d2db5045db04fb838506b3eb5d456e9 /sql/item_jsonfunc.cc | |
| parent | 655cba619d2e6556d4a7c6a3b9127f248bb8e5a0 (diff) | |
| parent | 4cbf77e16ef9324acf85c01bc63023d62b821752 (diff) | |
| download | mariadb-git-0aa9b03393f515d7b07c3139756c2a9270501c97.tar.gz | |
Merge branch '10.2' into 10.3
Diffstat (limited to 'sql/item_jsonfunc.cc')
| -rw-r--r-- | sql/item_jsonfunc.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/item_jsonfunc.cc b/sql/item_jsonfunc.cc index d1c15a0126e..2cda8b25a8a 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: @@ -2387,8 +2387,9 @@ String *Item_func_json_insert::val_str(String *str) if ((null_value= args[0]->null_value)) return 0; - str->set_charset(js->charset()); - json_string_set_cs(&key_name, js->charset()); + str->set_charset(collation.collation); + tmp_js.set_charset(collation.collation); + json_string_set_cs(&key_name, collation.collation); for (n_arg=1, n_path=0; n_arg < arg_count; n_arg+=2, n_path++) { @@ -2602,7 +2603,6 @@ continue_point: json_scan_start(&je, js->charset(),(const uchar *) js->ptr(), (const uchar *) js->ptr() + js->length()); str->length(0); - str->set_charset(js->charset()); if (json_nice(&je, str, Item_func_json_format::LOOSE)) goto js_error; |