diff options
author | unknown <sergefp@mysql.com> | 2004-12-13 20:10:07 +0300 |
---|---|---|
committer | unknown <sergefp@mysql.com> | 2004-12-13 20:10:07 +0300 |
commit | 2bd5c53c18ca208c7692076b2d53d4f0284c5730 (patch) | |
tree | d267c00c924268a47f11688ca46d18ee4ad5a09c /sql/item_row.cc | |
parent | ce8b0879ce77254c11d4dbd80c6e77083a55f713 (diff) | |
parent | 74a8fdd997ff8fd68a5364888d705a3b76c9e9ce (diff) | |
download | mariadb-git-2bd5c53c18ca208c7692076b2d53d4f0284c5730.tar.gz |
Merged (will need a post-merge fix)
sql/item.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
Diffstat (limited to 'sql/item_row.cc')
-rw-r--r-- | sql/item_row.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/item_row.cc b/sql/item_row.cc index 289efe45300..b65b0b7b608 100644 --- a/sql/item_row.cc +++ b/sql/item_row.cc @@ -95,7 +95,8 @@ void Item_row::split_sum_func(THD *thd, Item **ref_pointer_array, else if ((*arg)->used_tables() || (*arg)->type() == SUM_FUNC_ITEM) { uint el= fields.elements; - Item *new_item= new Item_ref(ref_pointer_array + el, 0, (*arg)->name); + Item *new_item= new Item_ref(ref_pointer_array + el, 0, (*arg)->name, + *arg); fields.push_front(*arg); ref_pointer_array[el]= *arg; thd->change_item_tree(arg, new_item); |