diff options
| author | Alexey Botchkov <holyfoot@askmonty.org> | 2016-12-06 01:32:13 +0400 |
|---|---|---|
| committer | Alexey Botchkov <holyfoot@askmonty.org> | 2016-12-06 01:32:13 +0400 |
| commit | 3bae5328ea55d40ea7a748ac7b07cf9ec82111bf (patch) | |
| tree | 2bd2c36abe2db116cca34bfde722f18ad378d0e6 /sql/item_jsonfunc.h | |
| parent | 486079d1594946f79ddf8fd803246109aacb78d2 (diff) | |
| download | mariadb-git-3bae5328ea55d40ea7a748ac7b07cf9ec82111bf.tar.gz | |
MDEV-11433 JSON_MERGE returns a non-NULL result with a NULL argument.
Item_func_json_merge fixed.
Diffstat (limited to 'sql/item_jsonfunc.h')
| -rw-r--r-- | sql/item_jsonfunc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_jsonfunc.h b/sql/item_jsonfunc.h index e8d677158ed..da9baf47648 100644 --- a/sql/item_jsonfunc.h +++ b/sql/item_jsonfunc.h @@ -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) {} |