json_type should consider the charset mbmaxlen

MariaDB · Jun 30, 2022 · ba5b2e7 · ba5b2e7
1 parent 5ab9265
commit ba5b2e7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/mysql-test/suite/json/r/json_no_table.result b/mysql-test/suite/json/r/json_no_table.result
@@ -3338,7 +3338,7 @@ OBJECT
 CREATE VIEW v1 AS SELECT JSON_TYPE(JSON_OBJECT());
 SELECT * FROM v1;
 JSON_TYPE(JSON_OBJECT())
-OBJE
+OBJECT
 drop view v1;
 #
 # Bug#21198333 SIG 6 IN ITEM_CACHE_JSON::CACHE_VALUE AT SQL/ITEM.CC:9470

diff --git a/sql/item_jsonfunc.cc b/sql/item_jsonfunc.cc
@@ -2800,7 +2800,7 @@ longlong Item_func_json_depth::val_int()
 bool Item_func_json_type::fix_length_and_dec()
 {
   collation.set(&my_charset_utf8mb3_general_ci);
-  max_length= 12;
+  max_length= 12 * collation.collation->mbmaxlen;
   set_maybe_null();
   return FALSE;
 }