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

MDEV-11473 JSON_REMOVE returns invalid results.

Browse Source 
Item_func_json_remove::val_str fixed.
This commit is contained in:
Alexey Botchkov
2016-12-05 07:42:00 +04:00
parent 7e03c67ae8
commit df87dce03c
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/r/func_json.result
View File

@@ -150,7 +150,7 @@ json_remove(@j, '$[0]')
[ ["b", "c"], "d"] [ ["b", "c"], "d"]
select json_remove(@j, '$[1]'); select json_remove(@j, '$[1]');
json_remove(@j, '$[1]') json_remove(@j, '$[1]')
["a" "d"] ["a", "d"]
select json_remove(@j, '$[2]'); select json_remove(@j, '$[2]');
json_remove(@j, '$[2]') json_remove(@j, '$[2]')
["a", ["b", "c"]] ["a", ["b", "c"]]

4
sql/item_jsonfunc.cc
View File

@@ -1667,9 +1667,7 @@ String *Item_func_json_remove::val_str(String *str)
rem_start= (const char *) (je.s.c_str - je.sav_c_len); rem_start= (const char *) (je.s.c_str - je.sav_c_len);
json_string_set_str(&key_name, lp->key, lp->key_end); json_string_set_str(&key_name, lp->key, lp->key_end);
if (json_key_matches(&je, &key_name)) if (json_key_matches(&je, &key_name))
{
goto v_found; goto v_found;
}
if (json_skip_key(&je)) if (json_skip_key(&je))
goto error; goto error;
@@ -1693,7 +1691,7 @@ v_found:
if (json_skip_key(&je) || json_scan_next(&je)) if (json_skip_key(&je) || json_scan_next(&je))
goto error; goto error;
rem_end= (je.state == JST_VALUE) ? rem_end= (je.state == JST_VALUE && n_item == 0) ?
(const char *) je.s.c_str : (const char *) (je.s.c_str - je.sav_c_len); (const char *) je.s.c_str : (const char *) (je.s.c_str - je.sav_c_len);
str->length(0); str->length(0);