summaryrefslogtreecommitdiff
path: root/sql/item_sum.cc
diff options
context:
space:
mode:
authorAlexander Nozdrin <alik@sun.com>2009-11-06 17:20:27 +0300
committerAlexander Nozdrin <alik@sun.com>2009-11-06 17:20:27 +0300
commit2ca5b2c7916fe5312617aa992d5292e724af75f0 (patch)
tree3fcae3d99a56ba99d825ae4457901d49e4b474e3 /sql/item_sum.cc
parent7a90f041cc3b6db8600e9469cab6d436653552ec (diff)
parent26fc5583196f7b88256cb733be033757a0517266 (diff)
downloadmariadb-git-2ca5b2c7916fe5312617aa992d5292e724af75f0.tar.gz
Manual merge from mysql-trunk-merge.
Diffstat (limited to 'sql/item_sum.cc')
-rw-r--r--sql/item_sum.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/item_sum.cc b/sql/item_sum.cc
index 273e996a6a0..68aa52f561c 100644
--- a/sql/item_sum.cc
+++ b/sql/item_sum.cc
@@ -522,7 +522,8 @@ Field *Item_sum::create_tmp_field(bool group, TABLE *table,
name, table->s, collation.collation);
break;
case DECIMAL_RESULT:
- field= Field_new_decimal::new_decimal_field(this);
+ field= new Field_new_decimal(max_length, maybe_null, name,
+ decimals, unsigned_flag);
break;
case ROW_RESULT:
default: