diff options
author | Sergei Golubchik <serg@mariadb.org> | 2019-09-06 11:53:10 +0200 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2019-09-06 11:53:10 +0200 |
commit | 244f0e6dd815b388282c15db4fe7f15533f4c8fc (patch) | |
tree | af138f2b3739a742c0c38173cdc86ec176fc0edd /sql/item_func.h | |
parent | 18af13b88ba580562981a190c25da128a2e9db26 (diff) | |
parent | 2842c369851a8afc2a944ce6f4f60fa052f20969 (diff) | |
download | mariadb-git-244f0e6dd815b388282c15db4fe7f15533f4c8fc.tar.gz |
Merge branch '10.3' into 10.4
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 eaa5410dea2..ef221f4b2ef 100644 --- a/sql/item_func.h +++ b/sql/item_func.h @@ -1327,11 +1327,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 *); |