diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-12 14:26:34 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-12 14:26:34 +0200 |
| commit | b32bc70e340b5b0d8fcb9aa48b1b875f3f2f12dc (patch) | |
| tree | 4edd8565c6eb0b1139cbb37c48f4d5f5a28798be /sql/item_jsonfunc.cc | |
| parent | f010c90807da68487b1ce4c952588c6c3def2afd (diff) | |
| parent | f72760df3390407c3cbe876e827818bc52849b71 (diff) | |
| download | mariadb-git-b32bc70e340b5b0d8fcb9aa48b1b875f3f2f12dc.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'sql/item_jsonfunc.cc')
| -rw-r--r-- | sql/item_jsonfunc.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/item_jsonfunc.cc b/sql/item_jsonfunc.cc index 588d41479e1..fe8784a7073 100644 --- a/sql/item_jsonfunc.cc +++ b/sql/item_jsonfunc.cc @@ -1489,9 +1489,10 @@ bool Item_func_json_array::fix_length_and_dec() if (arg_count == 0) { - collation.set(&my_charset_utf8_general_ci, + THD* thd= current_thd; + collation.set(thd->variables.collation_connection, DERIVATION_COERCIBLE, MY_REPERTOIRE_ASCII); - tmp_val.set_charset(&my_charset_utf8_general_ci); + tmp_val.set_charset(thd->variables.collation_connection); max_length= 2; return FALSE; } |