Skip to content

Commit 3371904

Browse files
author
Alexey Botchkov
committed
MDEV-11447 JSON_MERGE merges valid JSON objects incorrectly.
Test case added.
1 parent fba1eab commit 3371904

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

mysql-test/r/func_json.result

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,9 @@ NULL
237237
select json_merge('a','b');
238238
json_merge('a','b')
239239
NULL
240+
select json_merge('{"a":"b"}','{"c":"d"}');
241+
json_merge('{"a":"b"}','{"c":"d"}')
242+
{"a":"b", "c":"d"}
240243
select json_type('{"k1":123, "k2":345}');
241244
json_type('{"k1":123, "k2":345}')
242245
OBJECT

mysql-test/t/func_json.test

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ select json_merge('{"1": 2}', '{"true": false}');
9999
select json_merge('{"1": 2}', '{"true": false}', '{"3": 4}');
100100
select json_merge(NULL,json_object('foo', 1));
101101
select json_merge('a','b');
102+
select json_merge('{"a":"b"}','{"c":"d"}');
102103

103104
select json_type('{"k1":123, "k2":345}');
104105
select json_type('[123, "k2", 345]');

0 commit comments

Comments
 (0)