summaryrefslogtreecommitdiff
path: root/mysql-test/r
diff options
context:
space:
mode:
authorAlexey Botchkov <holyfoot@askmonty.org>2016-12-06 01:39:06 +0400
committerAlexey Botchkov <holyfoot@askmonty.org>2016-12-06 01:39:06 +0400
commit3371904380796322eebe70526475c98ca01f4918 (patch)
treed7f22eae8bd7d79ec460411f7cf6b0bd894e4c68 /mysql-test/r
parentfba1eab92fdf4658512825f5e203d91864e5d447 (diff)
downloadmariadb-git-3371904380796322eebe70526475c98ca01f4918.tar.gz
MDEV-11447 JSON_MERGE merges valid JSON objects incorrectly.
Test case added.
Diffstat (limited to 'mysql-test/r')
-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 041fed3aec4..ac604b9e09c 100644
--- a/mysql-test/r/func_json.result
+++ b/mysql-test/r/func_json.result
@@ -237,6 +237,9 @@ NULL
select json_merge('a','b');
json_merge('a','b')
NULL
+select json_merge('{"a":"b"}','{"c":"d"}');
+json_merge('{"a":"b"}','{"c":"d"}')
+{"a":"b", "c":"d"}
select json_type('{"k1":123, "k2":345}');
json_type('{"k1":123, "k2":345}')
OBJECT