diff options
| author | unknown <hf@deer.(none)> | 2004-01-20 20:55:47 +0400 |
|---|---|---|
| committer | unknown <hf@deer.(none)> | 2004-01-20 20:55:47 +0400 |
| commit | 9768dc84c83eee93954a57f310ef3896861432b2 (patch) | |
| tree | 38b07f5cc9271b9d99a946af98e1ce00eeaaa2e9 /sql/item_sum.h | |
| parent | b44c819bb61664b4b69680c0209b8627b40fe2b2 (diff) | |
| download | mariadb-git-9768dc84c83eee93954a57f310ef3896861432b2.tar.gz | |
Pack of changes about 'cleanup()'-s
Some errorneous code trimmed
sql/item.cc:
initialization of the Item_type_holder::orig_item added
sql/item.h:
No use to call cleanup() in ~Item
this only calls Item::cleanup()
We should use item->delete_self() instead of 'delete item' now
Code added to restore Item_type_holder::item_type value
sql/item_row.h:
this cleanup is wrong
sql/item_sum.cc:
initialization added
sql/item_sum.h:
Item_xxx& -> Item_xxx*
sql/sql_parse.cc:
delete item -> item->delete_self()
Diffstat (limited to 'sql/item_sum.h')
| -rw-r--r-- | sql/item_sum.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/item_sum.h b/sql/item_sum.h index 9f1c8a09a4e..dc84e4d4ab7 100644 --- a/sql/item_sum.h +++ b/sql/item_sum.h @@ -610,7 +610,7 @@ class Item_sum_udf_float :public Item_sum_num public: Item_sum_udf_float(udf_func *udf_arg) :Item_sum_num() {} Item_sum_udf_float(udf_func *udf_arg, List<Item> &list) :Item_sum_num() {} - Item_sum_udf_float(THD *thd, Item_sum_udf_float &item) + Item_sum_udf_float(THD *thd, Item_sum_udf_float *item) :Item_sum_num(thd, item) {} enum Sumfunctype sum_func () const { return UDF_SUM_FUNC; } double val() { return 0.0; } @@ -625,7 +625,7 @@ class Item_sum_udf_int :public Item_sum_num public: Item_sum_udf_int(udf_func *udf_arg) :Item_sum_num() {} Item_sum_udf_int(udf_func *udf_arg, List<Item> &list) :Item_sum_num() {} - Item_sum_udf_int(THD *thd, Item_sum_udf_int &item) + Item_sum_udf_int(THD *thd, Item_sum_udf_int *item) :Item_sum_num(thd, item) {} enum Sumfunctype sum_func () const { return UDF_SUM_FUNC; } longlong val_int() { return 0; } @@ -641,7 +641,7 @@ class Item_sum_udf_str :public Item_sum_num public: Item_sum_udf_str(udf_func *udf_arg) :Item_sum_num() {} Item_sum_udf_str(udf_func *udf_arg, List<Item> &list) :Item_sum_num() {} - Item_sum_udf_str(THD *thd, Item_sum_udf_str &item) + Item_sum_udf_str(THD *thd, Item_sum_udf_str *item) :Item_sum_num(thd, item) {} String *val_str(String *) { null_value=1; return 0; } double val() { null_value=1; return 0.0; } |