summaryrefslogtreecommitdiff
path: root/sql/item_jsonfunc.cc
diff options
context:
space:
mode:
authorAlexey Botchkov <holyfoot@askmonty.org>2021-10-11 15:05:44 +0400
committerAlexey Botchkov <holyfoot@askmonty.org>2021-10-11 15:05:44 +0400
commit42968ae75e7cd0763a2a2cbcce4ea99faaf27351 (patch)
tree88e0bfd84888783a2803068f21d4e16e0f2616ee /sql/item_jsonfunc.cc
parent3690c549c6e72646ba74f6b4c83813ee4ac3aea4 (diff)
downloadmariadb-git-bb-mdev-24585-hf.tar.gz
MDEV-24585 Assertion `je->s.cs == nice_js->charset()' failed in json_nice.bb-mdev-24585-hf
We should set the charset in Item_func_json_format::fix_length_and_dec().
Diffstat (limited to 'sql/item_jsonfunc.cc')
-rw-r--r--sql/item_jsonfunc.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/item_jsonfunc.cc b/sql/item_jsonfunc.cc
index 7db1ae1ffaf..ea70fbeebdb 100644
--- a/sql/item_jsonfunc.cc
+++ b/sql/item_jsonfunc.cc
@@ -3534,6 +3534,7 @@ const char *Item_func_json_format::func_name() const
bool Item_func_json_format::fix_length_and_dec()
{
decimals= 0;
+ collation.set(args[0]->collation);
max_length= args[0]->max_length;
maybe_null= 1;
return FALSE;