summaryrefslogtreecommitdiff
path: root/sql/item_sum.cc
diff options
context:
space:
mode:
authorigor@rurik.mysql.com <>2004-08-20 12:31:57 -0700
committerigor@rurik.mysql.com <>2004-08-20 12:31:57 -0700
commit433206c1f234a15d72387acee92a2a01c7abf356 (patch)
treebaa113a7bbce64712af6de6ff5b8852954583dd5 /sql/item_sum.cc
parent7a27f2ce8c81b3da34caa94fb44c7648050a27a1 (diff)
parentf2b9c5f491dfc373112e01f18dd7ce2b7bae3003 (diff)
downloadmariadb-git-433206c1f234a15d72387acee92a2a01c7abf356.tar.gz
Merge rurik.mysql.com:/home/igor/mysql-4.1
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
Diffstat (limited to 'sql/item_sum.cc')
-rw-r--r--sql/item_sum.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/item_sum.cc b/sql/item_sum.cc
index c256055d5bb..8e869f5492b 100644
--- a/sql/item_sum.cc
+++ b/sql/item_sum.cc
@@ -159,7 +159,10 @@ Item *Item_sum::get_tmp_table_item(THD *thd)
if (!arg->const_item())
{
if (arg->type() == Item::FIELD_ITEM)
+ {
+ arg->maybe_null= result_field_tmp->maybe_null();
((Item_field*) arg)->field= result_field_tmp++;
+ }
else
sum_item->args[i]= new Item_field(result_field_tmp++);
}