diff options
| author | monty@mysql.com <> | 2004-07-07 11:29:39 +0300 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-07-07 11:29:39 +0300 |
| commit | 1e311999950833cd81ca0788cd3656585c46d9ae (patch) | |
| tree | ca8974710746bb69b04a49bc64f938d0b1a8420a /sql/item_sum.h | |
| parent | 24a8dc2337a717ff340bac228383ef04437a4666 (diff) | |
| parent | 8462b8aeb83355fa6c5cb4f45ea0ed63ba9e0712 (diff) | |
| download | mariadb-git-1e311999950833cd81ca0788cd3656585c46d9ae.tar.gz | |
Merge with 4.1.3-beta
Diffstat (limited to 'sql/item_sum.h')
| -rw-r--r-- | sql/item_sum.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/item_sum.h b/sql/item_sum.h index ce46e92e6cf..2dde6f73425 100644 --- a/sql/item_sum.h +++ b/sql/item_sum.h @@ -207,6 +207,7 @@ class Item_sum_count :public Item_sum_int void make_const(longlong count_arg) { count=count_arg; used_table_cache=0; } longlong val_int(); void reset_field(); + void cleanup(); void update_field(); const char *func_name() const { return "count"; } Item *copy_or_same(THD* thd); @@ -463,6 +464,7 @@ class Item_sum_hybrid :public Item_sum void min_max_update_str_field(); void min_max_update_real_field(); void min_max_update_int_field(); + void cleanup(); }; @@ -729,7 +731,6 @@ class Item_func_group_concat : public Item_sum ORDER **order; TABLE_LIST *tables_list; ulong group_concat_max_len; - uint show_elements; uint arg_count_order; uint arg_count_field; uint field_list_offset; |