summaryrefslogtreecommitdiff
path: root/sql/item_sum.h
diff options
context:
space:
mode:
authorevgen@sunlight.local <>2006-03-30 19:04:21 +0400
committerevgen@sunlight.local <>2006-03-30 19:04:21 +0400
commit7e4535e2856d8dc6ef7f71ef66ea60c831c2771d (patch)
tree284b62cd744fc44cd8e4f81e1c6b094372e5f31a /sql/item_sum.h
parenteb075f2255b1135c062071dd632dcf20a8c5a45f (diff)
downloadmariadb-git-7e4535e2856d8dc6ef7f71ef66ea60c831c2771d.tar.gz
item_sum.cc, sql_select.cc:
After merge fix for bug#15560 item_sum.h: After merge fix for bug#15560
Diffstat (limited to 'sql/item_sum.h')
-rw-r--r--sql/item_sum.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_sum.h b/sql/item_sum.h
index 4bd28d6b1df..328f8dd8400 100644
--- a/sql/item_sum.h
+++ b/sql/item_sum.h
@@ -525,13 +525,13 @@ class Item_sum_count_distinct :public Item_sum_int
public:
Item_sum_count_distinct(List<Item> &list)
:Item_sum_int(list), table(0), field_lengths(0), tmp_table_param(0),
- tree(0), force_copy_fields(0), original(0), always_null(FALSE)
+ force_copy_fields(0), tree(0), original(0), always_null(FALSE)
{ quick_group= 0; }
Item_sum_count_distinct(THD *thd, Item_sum_count_distinct *item)
:Item_sum_int(thd, item), table(item->table),
field_lengths(item->field_lengths),
tmp_table_param(item->tmp_table_param),
- tree(item->tree), force_copy_fields(0), original(item),
+ force_copy_fields(0), tree(item->tree), original(item),
tree_key_length(item->tree_key_length),
always_null(item->always_null)
{}