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.3 into 10.4

Browse Source
This commit is contained in:
Marko Mäkelä
2019-04-02 11:04:54 +03:00
parent f9ab7b473a 7b42d892de
commit 5c3ff5cb93
143 changed files with 4033 additions and 2689 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
strings/json_lib.c
View File

@@ -1407,7 +1407,7 @@ int json_find_paths_next(json_engine_t *je, json_find_paths_t *state)
if (!json_key_matches(je, &key_name))
continue;
}
if ((uint) (cur_step - state->paths[p_c].last_step) == state->cur_depth)
if (cur_step == state->paths[p_c].last_step + state->cur_depth)
path_found= TRUE;
else
{
@@ -1440,7 +1440,7 @@ int json_find_paths_next(json_engine_t *je, json_find_paths_t *state)
cur_step->n_item == state->array_counters[state->cur_depth])
{
/* Array item matches. */
if ((uint) (cur_step - state->paths[p_c].last_step) == state->cur_depth)
if (cur_step == state->paths[p_c].last_step + state->cur_depth)
path_found= TRUE;
else
{
@@ -2094,5 +2094,3 @@ err_return:
return 1;
}