diff options
author | unknown <bell@sanja.is.com.ua> | 2004-10-09 01:01:19 +0300 |
---|---|---|
committer | unknown <bell@sanja.is.com.ua> | 2004-10-09 01:01:19 +0300 |
commit | c6b382d63b245352843ffe37977e3106daad5879 (patch) | |
tree | c4a132c49116c629c762d7542fc01417bf89e9ee /sql/item_sum.h | |
parent | 166d19e9638595cd56cdfb1d65dbebdd64e6013d (diff) | |
download | mariadb-git-c6b382d63b245352843ffe37977e3106daad5879.tar.gz |
args_copy and cleunup() removed from Item_sum
registration changing ITEM_SUM arguments added
sql/item.cc:
cleunup for Item_result_field
sql/item.h:
cleunup for Item_result_field
sql/item_sum.cc:
args_copy and cleunup() removed from Item_sum
sql/item_sum.h:
args_copy and cleunup() removed from Item_sum
sql/sql_select.cc:
registration changing ITEM_SUM arguments
Diffstat (limited to 'sql/item_sum.h')
-rw-r--r-- | sql/item_sum.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/sql/item_sum.h b/sql/item_sum.h index 5081d592654..2e85ba87468 100644 --- a/sql/item_sum.h +++ b/sql/item_sum.h @@ -33,23 +33,22 @@ public: }; Item **args, *tmp_args[2]; - Item **args_copy; /* copy of arguments for PS */ uint arg_count; bool quick_group; /* If incremental update of fields */ void mark_as_sum_func(); - Item_sum() :args_copy(0), arg_count(0), quick_group(1) + Item_sum() :arg_count(0), quick_group(1) { mark_as_sum_func(); } Item_sum(Item *a) - :args(tmp_args), args_copy(0), arg_count(1), quick_group(1) + :args(tmp_args), arg_count(1), quick_group(1) { args[0]=a; mark_as_sum_func(); } Item_sum( Item *a, Item *b ) - :args(tmp_args), args_copy(0), arg_count(2), quick_group(1) + :args(tmp_args), arg_count(2), quick_group(1) { args[0]=a; args[1]=b; mark_as_sum_func(); @@ -57,7 +56,6 @@ public: Item_sum(List<Item> &list); //Copy constructor, need to perform subselects with temporary tables Item_sum(THD *thd, Item_sum *item); - void cleanup(); enum Type type() const { return SUM_FUNC_ITEM; } virtual enum Sumfunctype sum_func () const=0; inline bool reset() { clear(); return add(); }; @@ -92,8 +90,6 @@ public: virtual bool setup(THD *thd) {return 0;} virtual void make_unique() {} Item *get_tmp_table_item(THD *thd); - bool save_args_for_prepared_statement(THD *); - bool save_args(Item_arena *arena); bool walk (Item_processor processor, byte *argument); }; |