diff options
| author | Alexander Barkov <bar@mariadb.org> | 2015-10-12 10:49:37 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2015-10-12 10:49:37 +0400 |
| commit | 0b4c3ad8181b909a3af04847e229900b1e9c5232 (patch) | |
| tree | 1d40f60108f135f39656d709c7cf90e87340192b /sql/item_func.h | |
| parent | affff1aefc81ea0a3cb778a6617504ccd1e905fc (diff) | |
| download | mariadb-git-0b4c3ad8181b909a3af04847e229900b1e9c5232.tar.gz | |
Moving Used_tables_and_const_chache from Item_func to Item_func_or_sum
and thus reusing Used_tables_and_const_cache for Item_sum instead of
declaring the same members inside Item_sum.
Diffstat (limited to 'sql/item_func.h')
| -rw-r--r-- | sql/item_func.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sql/item_func.h b/sql/item_func.h index d524e62c374..eca798dcaf7 100644 --- a/sql/item_func.h +++ b/sql/item_func.h @@ -31,7 +31,7 @@ extern "C" /* Bug in BSDI include file */ #endif -class Item_func :public Item_func_or_sum, public Used_tables_and_const_cache +class Item_func :public Item_func_or_sum { void sync_with_sum_func_and_with_field(List<Item> &list); protected: @@ -106,8 +106,8 @@ public: set_arguments(thd, list); } // Constructor used for Item_cond_and/or (see Item comment) - Item_func(THD *thd, Item_func *item) - :Item_func_or_sum(thd, item), Used_tables_and_const_cache(item), + Item_func(THD *thd, Item_func *item): + Item_func_or_sum(thd, item), allowed_arg_cols(item->allowed_arg_cols), not_null_tables_cache(item->not_null_tables_cache) { @@ -120,7 +120,6 @@ public: } void fix_after_pullout(st_select_lex *new_parent, Item **ref); void quick_fix_field(); - table_map used_tables() const; table_map not_null_tables() const; void update_used_tables() { @@ -137,7 +136,6 @@ public: } bool eq(const Item *item, bool binary_cmp) const; virtual Item *key_item() const { return args[0]; } - virtual bool const_item() const { return const_item_cache; } void set_arguments(THD *thd, List<Item> &list) { allowed_arg_cols= 1; |