From 3371904380796322eebe70526475c98ca01f4918 Mon Sep 17 00:00:00 2001 From: Alexey Botchkov Date: Tue, 6 Dec 2016 01:39:06 +0400 Subject: [PATCH] MDEV-11447 JSON_MERGE merges valid JSON objects incorrectly. Test case added. --- mysql-test/r/func_json.result | 3 +++ mysql-test/t/func_json.test | 1 + 2 files changed, 4 insertions(+) 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 diff --git a/mysql-test/t/func_json.test b/mysql-test/t/func_json.test index 7c892eebc4e..2b4385a43b9 100644 --- a/mysql-test/t/func_json.test +++ b/mysql-test/t/func_json.test @@ -99,6 +99,7 @@ select json_merge('{"1": 2}', '{"true": false}'); select json_merge('{"1": 2}', '{"true": false}', '{"3": 4}'); select json_merge(NULL,json_object('foo', 1)); select json_merge('a','b'); +select json_merge('{"a":"b"}','{"c":"d"}'); select json_type('{"k1":123, "k2":345}'); select json_type('[123, "k2", 345]');