diff options
| author | Alexey Botchkov <holyfoot@askmonty.org> | 2017-02-10 01:05:27 +0400 |
|---|---|---|
| committer | Alexey Botchkov <holyfoot@askmonty.org> | 2017-02-10 01:05:27 +0400 |
| commit | 25aaecb240d20547791cbbc06f1ccb3630782cd5 (patch) | |
| tree | 453067cc842f869491e2fa77a5e7524017448fc7 /strings | |
| parent | 3ae038b732ce503fb839e9095355e05f5c6866f9 (diff) | |
| download | mariadb-git-25aaecb240d20547791cbbc06f1ccb3630782cd5.tar.gz | |
MDEV-11858 json_merge() concatenates instead of merging.
Fix json_merge implementation.
Diffstat (limited to 'strings')
| -rw-r--r-- | strings/json_lib.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/strings/json_lib.c b/strings/json_lib.c index 213be62aa22..2a5d71a2133 100644 --- a/strings/json_lib.c +++ b/strings/json_lib.c @@ -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; |