database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

MDEV-11433 JSON_MERGE returns a non-NULL result with a NULL argument.

Browse Source 
Item_func_json_merge fixed.
This commit is contained in:
Alexey Botchkov
2016-12-06 01:32:13 +04:00
parent 486079d159
commit 3bae5328ea
4 changed files with 81 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
mysql-test/r/func_json.result
View File

@ -218,7 +218,22 @@ select json_merge('string');
ERROR 42000: Incorrect parameter count in the call to native function 'json_merge'
select json_merge('string', 123);
json_merge('string', 123)
NULL
select json_merge('"string"', 123);
json_merge('"string"', 123)
["string", 123]
select json_merge('[1, 2]', '[true, false]');
json_merge('[1, 2]', '[true, false]')
[1, 2, true, false]
select json_merge('{"1": 2}', '{"true": false}');
json_merge('{"1": 2}', '{"true": false}')
{"1": 2, "true": false}
select json_merge('{"1": 2}', '{"true": false}', '{"3": 4}');
json_merge('{"1": 2}', '{"true": false}', '{"3": 4}')
{"1": 2, "true": false, "3": 4}
select json_merge(NULL,json_object('foo', 1));
json_merge(NULL,json_object('foo', 1))
NULL
select json_type('{"k1":123, "k2":345}');
json_type('{"k1":123, "k2":345}')
OBJECT