diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2019-05-17 17:23:01 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2019-05-17 17:23:01 +0200 |
| commit | c1fd027115ce9a32bcbe42796f4df58309636705 (patch) | |
| tree | 49ba501be560c1aa17dbf4c066652c7d3b1b876b /sql/item_jsonfunc.h | |
| parent | e506bef430c3648f88469d42631136080db9f332 (diff) | |
| parent | fae6539ef727b56bb5a58d4bbe515512e85ba2f4 (diff) | |
| download | mariadb-git-c1fd027115ce9a32bcbe42796f4df58309636705.tar.gz | |
Merge branch '10.2' into 10.3
Diffstat (limited to 'sql/item_jsonfunc.h')
| -rw-r--r-- | sql/item_jsonfunc.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/sql/item_jsonfunc.h b/sql/item_jsonfunc.h index a4705f012f2..e9b77502e80 100644 --- a/sql/item_jsonfunc.h +++ b/sql/item_jsonfunc.h @@ -289,11 +289,21 @@ public: Item_func_json_array(thd, list) {} String *val_str(String *); bool is_json_type() { return true; } - const char *func_name() const { return "json_merge"; } + const char *func_name() const { return "json_merge_preserve"; } Item *get_copy(THD *thd) { return get_item_copy<Item_func_json_merge>(thd, this); } }; +class Item_func_json_merge_patch: public Item_func_json_merge +{ +public: + Item_func_json_merge_patch(THD *thd, List<Item> &list): + Item_func_json_merge(thd, list) {} + const char *func_name() const { return "json_merge_patch"; } + String *val_str(String *); + Item *get_copy(THD *thd) + { return get_item_copy<Item_func_json_merge_patch>(thd, this); } +}; class Item_func_json_length: public Item_long_func { |