diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-10-21 20:41:24 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-10-21 20:41:24 +0300 |
commit | 4d21a145de11eaff28f98fe4ebed56a803450ce0 (patch) | |
tree | 5c4b00b96e189e3492de198c4080265e81efc832 /sql/item_jsonfunc.cc | |
parent | 4f59f9078fd9af1e958f4a30788084598053bf50 (diff) | |
parent | 059a5f11711fd502982abed8781faf9f255fa975 (diff) | |
download | mariadb-git-bb-10.6-MDEV-26769.tar.gz |
Merge 10.6bb-10.6-MDEV-26769
Diffstat (limited to 'sql/item_jsonfunc.cc')
-rw-r--r-- | sql/item_jsonfunc.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/item_jsonfunc.cc b/sql/item_jsonfunc.cc index 4b63b119a83..25f2c54cec0 100644 --- a/sql/item_jsonfunc.cc +++ b/sql/item_jsonfunc.cc @@ -3580,6 +3580,7 @@ LEX_CSTRING Item_func_json_format::func_name_cstring() const bool Item_func_json_format::fix_length_and_dec() { decimals= 0; + collation.set(args[0]->collation); max_length= args[0]->max_length; set_maybe_null(); return FALSE; |