summaryrefslogtreecommitdiff
path: root/sql/item_sum.cc
diff options
context:
space:
mode:
authormonty@mashka.mysql.fi <>2003-02-04 21:52:14 +0200
committermonty@mashka.mysql.fi <>2003-02-04 21:52:14 +0200
commit023d6dd39b9068ab8096c5ec60ab82bd10dbcee2 (patch)
treebad5f8dd7f020cc76a4c5e0f19bd130e3fb4a735 /sql/item_sum.cc
parent6a32ae735541b4780a209e883430ded343115792 (diff)
parent5ce0cd16b8b9fa05c781ac6ff4687133ed145d84 (diff)
downloadmariadb-git-023d6dd39b9068ab8096c5ec60ab82bd10dbcee2.tar.gz
Merge with 4.0.11
Diffstat (limited to 'sql/item_sum.cc')
-rw-r--r--sql/item_sum.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_sum.cc b/sql/item_sum.cc
index c2725ed28cf..9af3eef3cd7 100644
--- a/sql/item_sum.cc
+++ b/sql/item_sum.cc
@@ -1196,7 +1196,7 @@ bool Item_sum_count_distinct::add()
if (always_null)
return 0;
copy_fields(tmp_table_param);
- copy_funcs(tmp_table_param->funcs);
+ copy_funcs(tmp_table_param->items_to_copy);
for (Field **field=table->field ; *field ; field++)
if ((*field)->is_real_null(0))