database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

json_type should consider the charset mbmaxlen

Browse Source
This commit is contained in:
qggcs
2022-06-25 22:03:08 +08:00
committed by Rucha Deodhar
parent 5ab9265677
commit ba5b2e7b29
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/json/r/json_no_table.result
View File

@@ -3338,7 +3338,7 @@ OBJECT
CREATE VIEW v1 AS SELECT JSON_TYPE(JSON_OBJECT()); CREATE VIEW v1 AS SELECT JSON_TYPE(JSON_OBJECT());
SELECT * FROM v1; SELECT * FROM v1;
JSON_TYPE(JSON_OBJECT()) JSON_TYPE(JSON_OBJECT())
OBJE OBJECT
drop view v1; drop view v1;
# #
# Bug#21198333 SIG 6 IN ITEM_CACHE_JSON::CACHE_VALUE AT SQL/ITEM.CC:9470 # Bug#21198333 SIG 6 IN ITEM_CACHE_JSON::CACHE_VALUE AT SQL/ITEM.CC:9470

2
sql/item_jsonfunc.cc
View File

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