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

Merge 10.5 into 10.6

Browse Source
This commit is contained in:
Marko Mäkelä
2022-08-22 14:02:43 +03:00
parent f02ca429f7 1d90d6874d
commit d65a2b7bde
18 changed files with 253 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sql/item_jsonfunc.cc
View File

@@ -1,4 +1,4 @@
/* Copyright (c) 2016, 2021, MariaDB Corporation.
/* Copyright (c) 2016, 2022, MariaDB Corporation.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -591,10 +591,6 @@ bool Item_func_json_query::fix_length_and_dec()
}
/*
Returns NULL, not an error if the found value
is not a scalar.
*/
bool Json_path_extractor::extract(String *str, Item *item_js, Item *item_jp,
CHARSET_INFO *cs)
{
@@ -627,6 +623,9 @@ continue_search:
if (json_read_value(&je))
return true;
if (je.value_type == JSON_VALUE_NULL)
return true;
if (unlikely(check_and_get_value(&je, str, &error)))
{
if (error)
@@ -1109,7 +1108,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;