MDEV-24585 Assertion `je->s.cs == nice_js->charset()' failed in json_…

…nice. We should set the charset in Item_func_json_format::fix_length_and_dec().
MariaDB · Oct 19, 2021 · 1a54cf6 · 1a54cf6
1 parent 5316703
commit 1a54cf6
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git a/mysql-test/r/func_json.result b/mysql-test/r/func_json.result
@@ -934,5 +934,11 @@ CAST(JSON_EXTRACT('{"x":false}', '$.x') AS DECIMAL) AS cd;
 cf	cd
 0	0
 #
+# MDEV-24585 Assertion `je->s.cs == nice_js->charset()' failed in json_nice.
+#
+SELECT JSON_REPLACE( JSON_DETAILED('["x"]'), '$.a', 'xx' );
+JSON_REPLACE( JSON_DETAILED('["x"]'), '$.a', 'xx' )
+["x"]
+#
 # End of 10.2 tests
 #
diff --git a/mysql-test/t/func_json.test b/mysql-test/t/func_json.test
@@ -554,6 +554,12 @@ SELECT
   CAST(JSON_EXTRACT('{"x":false}', '$.x') AS DECIMAL) AS cd;
 
 
+--echo #
+--echo # MDEV-24585 Assertion `je->s.cs == nice_js->charset()' failed in json_nice.
+--echo #
+
+SELECT JSON_REPLACE( JSON_DETAILED('["x"]'), '$.a', 'xx' );
+
 --echo #
 --echo # End of 10.2 tests
 --echo #
diff --git 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;