diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-08-09 12:35:21 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-08-09 12:35:21 +0300 |
commit | 0930d6698fabc33a7b0dffaf13ff7a9e26fc6908 (patch) | |
tree | f229165bdbdcd8be17783904e53d3beadd69a902 /sql/item_jsonfunc.h | |
parent | 1f0a22acbd906f391ed7ead6cad5ef50b89236c1 (diff) | |
parent | 6b14fd6d6d75e09b966ddb0750ccfbb94a74a909 (diff) | |
download | mariadb-git-0930d6698fabc33a7b0dffaf13ff7a9e26fc6908.tar.gz |
Merge 10.2 into bb-10.2-ext
Diffstat (limited to 'sql/item_jsonfunc.h')
-rw-r--r-- | sql/item_jsonfunc.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/item_jsonfunc.h b/sql/item_jsonfunc.h index 4235bd3ea9f..abed19491e8 100644 --- a/sql/item_jsonfunc.h +++ b/sql/item_jsonfunc.h @@ -125,12 +125,14 @@ class Item_func_json_unquote: public Item_str_func { protected: String tmp_s; - + String *read_json(json_engine_t *je); public: Item_func_json_unquote(THD *thd, Item *s): Item_str_func(thd, s) {} const char *func_name() const { return "json_unquote"; } void fix_length_and_dec(); String *val_str(String *); + double val_real(); + longlong val_int(); Item *get_copy(THD *thd, MEM_ROOT *mem_root) { return get_item_copy<Item_func_json_unquote>(thd, mem_root, this); } }; |