database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge branch '11.1' into mariadb-11.1.3

Browse Source
This commit is contained in:
Oleksandr Byelkin
2023-11-14 10:14:07 +01:00
parent 0f5613a25f 28c86f81f4
commit 59fd0e6aa0
5 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1,4 +1,4 @@
MYSQL_VERSION_MAJOR=11
MYSQL_VERSION_MINOR=1
MYSQL_VERSION_PATCH=3
MYSQL_VERSION_PATCH=4
SERVER_MATURITY=stable

7
mysql-test/main/func_json.result
View File

@ -4699,4 +4699,11 @@ NULL
SELECT JSON_SCHEMA_VALID(NULL, NULL);
JSON_SCHEMA_VALID(NULL, NULL)
NULL
#
# MDEV-31599: Assertion `0' failed in Item_param::can_return_value from Item::val_json,
# UBSAN: member access within null pointer of type 'struct String' in
# sql/item_jsonfunc.cc
#
PREPARE s FROM 'SELECT JSON_SCHEMA_VALID (?,''{}'') FROM DUAL';
ERROR HY000: Variable schema is not supported.
# End of 11.1 test

9
mysql-test/main/func_json.test
View File

@ -3668,4 +3668,13 @@ SELECT JSON_SCHEMA_VALID('{}', NULL);
SELECT JSON_SCHEMA_VALID(NULL, '{}');
SELECT JSON_SCHEMA_VALID(NULL, NULL);
--echo #
--echo # MDEV-31599: Assertion `0' failed in Item_param::can_return_value from Item::val_json,
--echo # UBSAN: member access within null pointer of type 'struct String' in
--echo # sql/item_jsonfunc.cc
--echo #
--error ER_JSON_NO_VARIABLE_SCHEMA
PREPARE s FROM 'SELECT JSON_SCHEMA_VALID (?,''{}'') FROM DUAL';
--echo # End of 11.1 test

12
sql/item_jsonfunc.cc
View File

@ -4798,15 +4798,21 @@ If any of them fails, return false, else return true.
bool Item_func_json_schema_valid::fix_length_and_dec(THD *thd)
{
json_engine_t je;
bool res= 0;
bool res= 0, is_schema_constant= args[0]->const_item();
String *js= args[0]->val_json(&tmp_js);
String *js= NULL;
if ((null_value= args[0]->null_value))
if (!is_schema_constant || (null_value= args[0]->null_value))
{
if (!is_schema_constant)
{
my_error(ER_JSON_NO_VARIABLE_SCHEMA, MYF(0));
}
null_value= 1;
return 0;
}
js= args[0]->val_json(&tmp_js);
json_scan_start(&je, js->charset(), (const uchar *) js->ptr(),
(const uchar *) js->ptr() + js->length());
if (!create_object_and_handle_keyword(thd, &je, &keyword_list,

2
sql/share/errmsg-utf8.txt
View File

@ -11972,3 +11972,5 @@ ER_JSON_INVALID_VALUE_FOR_KEYWORD
ER_JSON_SCHEMA_KEYWORD_UNSUPPORTED
eng "%s keyword is not supported"
sw "%s neno kuu halitumiki"
ER_JSON_NO_VARIABLE_SCHEMA
eng "Variable schema is not supported."