diff options
| author | unknown <igor@rurik.mysql.com> | 2004-08-20 12:31:57 -0700 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2004-08-20 12:31:57 -0700 |
| commit | b9120c197964e0bd799a93465e548d7e6cc4d021 (patch) | |
| tree | baa113a7bbce64712af6de6ff5b8852954583dd5 /sql/item_sum.cc | |
| parent | 8f68a9eb6f62183742d8f37bc5ec94a48e831a5d (diff) | |
| parent | 090bc713a4ebae95ac07a862800a69e723833b29 (diff) | |
| download | mariadb-git-b9120c197964e0bd799a93465e548d7e6cc4d021.tar.gz | |
Merge rurik.mysql.com:/home/igor/mysql-4.1
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
sql/item_sum.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql/item_sum.cc')
| -rw-r--r-- | sql/item_sum.cc | 3 |
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++); } |