summaryrefslogtreecommitdiff
path: root/sql/item_uniq.h
diff options
context:
space:
mode:
authorunknown <bell@sanja.is.com.ua>2003-01-30 18:07:39 +0200
committerunknown <bell@sanja.is.com.ua>2003-01-30 18:07:39 +0200
commit43b99e58c5eca989325b0f273f47b2b18e32c20c (patch)
treebafc998fbb4616150087e1b6ce3cfc1d48b8362f /sql/item_uniq.h
parenta0ddb72d52de3576fb0441e37e169f7cedd1fc1e (diff)
downloadmariadb-git-43b99e58c5eca989325b0f273f47b2b18e32c20c.tar.gz
changes based on partial revie of task 577 (SCRUM)
sql/item.cc: Fixed Item usual constructor to call current_thd only once. Fixed copy constructor to receive THD pointer via arguments. added comments removed counter-1 and unnessesary initializaton of counter sql/item.h: Fixed copy constructor to receive THD pointer via arguments. Renamed get_same to copy_or_same. THD pointetr added to copy_or_same and get_tmp_table_item. sql/item_cmpfunc.cc: fixed layout fixed direct call of destructor sql/item_func.cc: fiex layout THD pointetr added to get_tmp_table_item. sql/item_func.h: THD pointetr added to get_tmp_table_item. sql/item_sum.cc: Fixed copy constructor to receive THD pointer via arguments. Renamed get_same to copy_or_same. THD pointetr added to copy_or_same and get_tmp_table_item. sql/item_sum.h: fixed layout Fixed copy constructor to receive THD pointer via arguments. Renamed get_same to copy_or_same. THD pointetr added to copy_or_same and get_tmp_table_item. sql/item_uniq.h: Fixed copy constructor to receive THD pointer via arguments. Renamed get_same to copy_or_same. THD pointetr added to copy_or_same and get_tmp_table_item. sql/sql_base.cc: count from 0 sql/sql_select.cc: removed counter-1 and unnessesary initializaton of counter THD pointetr added to get_tmp_table_item and change_to_use_tmp_fields.
Diffstat (limited to 'sql/item_uniq.h')
-rw-r--r--sql/item_uniq.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/sql/item_uniq.h b/sql/item_uniq.h
index 9098dfe7d41..ac004e747f8 100644
--- a/sql/item_uniq.h
+++ b/sql/item_uniq.h
@@ -37,7 +37,8 @@ class Item_sum_unique_users :public Item_sum_num
public:
Item_sum_unique_users(Item *name_arg,int start,int end,Item *item_arg)
:Item_sum_num(item_arg) {}
- Item_sum_unique_users(Item_sum_unique_users &item): Item_sum_num(item) {}
+ Item_sum_unique_users(THD *thd, Item_sum_unique_users &item)
+ :Item_sum_num(thd, item) {}
double val() { return 0.0; }
enum Sumfunctype sum_func () const {return UNIQUE_USERS_FUNC;}
void reset() {}
@@ -49,5 +50,8 @@ public:
fixed= 1;
return 0;
}
- Item_sum * get_same() { return new Item_sum_unique_users(*this); }
+ Item_sum *copy_or_same(THD* thd)
+ {
+ return new Item_sum_unique_users(thd, *this);
+ }
};