database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +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

2
sql/item_jsonfunc.h
View File

@ -278,7 +278,7 @@ public:
class Item_func_json_merge: public Item_func_json_array
{
protected:
String tmp_val;
String tmp_js1, tmp_js2;
public:
Item_func_json_merge(THD *thd, List<Item> &list):
Item_func_json_array(thd, list) {}