summaryrefslogtreecommitdiff
path: root/strings/json_lib.c
diff options
context:
space:
mode:
authorAlexey Botchkov <holyfoot@askmonty.org>2018-09-13 13:42:09 +0400
committerAlexey Botchkov <holyfoot@askmonty.org>2018-09-13 13:42:09 +0400
commitf54485eadbab7fa1c6a388408cf908daf488284c (patch)
tree37c64375a46092978c126c2208a064f54a6971c2 /strings/json_lib.c
parent2b46dca5d7fdade3f64b993dc30686693210022a (diff)
downloadmariadb-git-f54485eadbab7fa1c6a388408cf908daf488284c.tar.gz
MDEV-17001 JSON_MERGE returns nullwhen merging empty array.
Don't add the comma if nothing appended to the array.
Diffstat (limited to 'strings/json_lib.c')
-rw-r--r--strings/json_lib.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/strings/json_lib.c b/strings/json_lib.c
index 1c0ff4b5345..4f12cbb82b5 100644
--- a/strings/json_lib.c
+++ b/strings/json_lib.c
@@ -1197,10 +1197,6 @@ int json_skip_to_level(json_engine_t *j, int level)
}
-#define json_skip_level(json_engine) \
- json_skip_to_level((json_engine), (json_engine)->stack_p)
-
-
/*
works as json_skip_level() but also counts items on the current
level skipped.