diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-02 06:17:51 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-02 06:17:51 +0300 |
commit | 1df1a6392477ad211b2a66c6eccbe9d5c6316c7e (patch) | |
tree | 7f38ad7d6e69ea53fb9c887ff9aaa953f103ea54 /sql/item_jsonfunc.h | |
parent | 6d3747a294d75ab8153f82c5b2d61c3bf17b04de (diff) | |
parent | dba7e1e8e14254c9de61e74b7e68cdbbad0038a8 (diff) | |
download | mariadb-git-1df1a6392477ad211b2a66c6eccbe9d5c6316c7e.tar.gz |
Merge 10.2 into 10.3
Diffstat (limited to 'sql/item_jsonfunc.h')
-rw-r--r-- | sql/item_jsonfunc.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/item_jsonfunc.h b/sql/item_jsonfunc.h index e9b77502e80..c703533f799 100644 --- a/sql/item_jsonfunc.h +++ b/sql/item_jsonfunc.h @@ -169,6 +169,7 @@ public: String *val_str(String *); longlong val_int(); double val_real(); + my_decimal *val_decimal(my_decimal *); uint get_n_paths() const { return arg_count - 1; } Item *get_copy(THD *thd) { return get_item_copy<Item_func_json_extract>(thd, this); } |