summaryrefslogtreecommitdiff
path: root/mysql-test/r/func_json.result
diff options
context:
space:
mode:
authorAlexey Botchkov <holyfoot@askmonty.org>2017-09-12 15:21:53 +0400
committerAlexey Botchkov <holyfoot@askmonty.org>2017-09-12 15:21:53 +0400
commit0cd731864e6e4d88b75bfea4f02454871aedb89e (patch)
tree411422ac01b096fd88e374813fa58f10d8339c7b /mysql-test/r/func_json.result
parent467acc2119e9408b640915f767515b9242a4d6a3 (diff)
downloadmariadb-git-0cd731864e6e4d88b75bfea4f02454871aedb89e.tar.gz
MDEV-13104 Json functions.
An extra ',' added to the JSON_MERGE result making it invalid.
Diffstat (limited to 'mysql-test/r/func_json.result')
-rw-r--r--mysql-test/r/func_json.result3
1 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/r/func_json.result b/mysql-test/r/func_json.result
index 80de41ccb07..fc4eb16a067 100644
--- a/mysql-test/r/func_json.result
+++ b/mysql-test/r/func_json.result
@@ -683,3 +683,6 @@ JSON_OBJECT("foo", "bar`bar")
SELECT JSON_SET('{}', '$.age', 87);
JSON_SET('{}', '$.age', 87)
{"age": 87}
+SELECT JSON_MERGE('[]', '{"c":"d"}');
+JSON_MERGE('[]', '{"c":"d"}')
+[{"c": "d"}]