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

Merge 10.3 into 10.4

Browse Source
This commit is contained in:
Marko Mäkelä
2022-08-22 12:34:42 +03:00
parent 6005f3c548 fd0cd4801a
commit 36d173e523
18 changed files with 256 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/item_jsonfunc.cc
View File

@ -613,6 +613,12 @@ continue_search:
if (json_read_value(&je))
goto err_return;
if (je.value_type == JSON_VALUE_NULL)
{
null_value= 1;
return NULL;
}
if (unlikely(check_and_get_value(&je, str, &error)))
{
if (error)
@ -1104,7 +1110,6 @@ my_decimal *Item_func_json_extract::val_decimal(my_decimal *to)
case JSON_VALUE_ARRAY:
case JSON_VALUE_FALSE:
case JSON_VALUE_UNINITALIZED:
// TODO: fix: NULL should be NULL
case JSON_VALUE_NULL:
int2my_decimal(E_DEC_FATAL_ERROR, 0, false/*unsigned_flag*/, to);
return to;