summaryrefslogtreecommitdiff
path: root/sql/item_sum.cc
diff options
context:
space:
mode:
authorunknown <ramil@mysql.com>2005-03-30 18:57:56 +0500
committerunknown <ramil@mysql.com>2005-03-30 18:57:56 +0500
commitb8aa173e9c4c8aeef3c58dcfcc15088edb75786f (patch)
treeb8a19196a871887e68c2eed748f31459b4451f53 /sql/item_sum.cc
parent92df4ec03bb7c25f32cd1440f3da3cfe236b9b91 (diff)
downloadmariadb-git-b8aa173e9c4c8aeef3c58dcfcc15088edb75786f.tar.gz
after merge fix/
Diffstat (limited to 'sql/item_sum.cc')
-rw-r--r--sql/item_sum.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_sum.cc b/sql/item_sum.cc
index 6b586c66ecf..3dbc3833f9e 100644
--- a/sql/item_sum.cc
+++ b/sql/item_sum.cc
@@ -311,8 +311,8 @@ Field *Item_sum_hybrid::create_tmp_field(bool group, TABLE *table,
{
Field *field= ((Item_field*) args[0])->field;
- if ((field= create_tmp_field_from_field(current_thd, field, this, table,
- 0, convert_blob_length)))
+ if ((field= create_tmp_field_from_field(current_thd, field, name, table,
+ NULL, convert_blob_length)))
field->flags&= ~NOT_NULL_FLAG;
return field;
}