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

MDEV-11858 json_merge() concatenates instead of merging.

Browse Source 
Fix json_merge implementation.
This commit is contained in:
Alexey Botchkov
2017-02-10 01:05:27 +04:00
parent 3ae038b732
commit 25aaecb240
5 changed files with 236 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
strings/json_lib.c
View File

@ -1197,13 +1197,6 @@ int json_skip_to_level(json_engine_t *j, int level)
int json_skip_key(json_engine_t *j)
{
if (j->state == JST_KEY)
{
while (json_read_keyname_chr(j) == 0);
if (j->s.error)
return 1;
}
if (json_read_value(j))
return 1;