diff options
| author | Alexander Barkov <bar@mariadb.com> | 2019-09-04 09:55:59 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.com> | 2019-09-04 10:19:58 +0400 |
| commit | 7e08ac0b41b50195aa79f6ac185bc69a91a960ca (patch) | |
| tree | 3a399827dc8e6bd89bbb6d142f21eda8bd659119 /sql/item_func.h | |
| parent | a071e0e029cd7c155cff1054d9f7f8a6aa898620 (diff) | |
| parent | ef00ac4c86daf3294c46a45358da636763fb0049 (diff) | |
| download | mariadb-git-7e08ac0b41b50195aa79f6ac185bc69a91a960ca.tar.gz | |
Merge 10.2 (up to commit ef00ac4c86daf3294c46a45358da636763fb0049) into 10.3
Diffstat (limited to 'sql/item_func.h')
| -rw-r--r-- | sql/item_func.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/item_func.h b/sql/item_func.h index 6345dd41f71..088886f9860 100644 --- a/sql/item_func.h +++ b/sql/item_func.h @@ -1095,11 +1095,16 @@ public: class Item_func_minus :public Item_func_additive_op { + Sql_mode_dependency m_sql_mode_dependency; public: Item_func_minus(THD *thd, Item *a, Item *b): Item_func_additive_op(thd, a, b) {} const char *func_name() const { return "-"; } enum precedence precedence() const { return ADD_PRECEDENCE; } + Sql_mode_dependency value_depends_on_sql_mode() const + { + return m_sql_mode_dependency; + } longlong int_op(); double real_op(); my_decimal *decimal_op(my_decimal *); |