summaryrefslogtreecommitdiff
path: root/sql/item_sum.cc
diff options
context:
space:
mode:
authorunknown <ramil/ram@mysql.com/ramil.myoffice.izhnet.ru>2007-01-31 11:14:32 +0400
committerunknown <ramil/ram@mysql.com/ramil.myoffice.izhnet.ru>2007-01-31 11:14:32 +0400
commitabf7eb0627d1a652beaa2380dbb94c6ad0ae0a2a (patch)
tree7350d663eb11a83d6876cb846cb2ba31e9b0e6a4 /sql/item_sum.cc
parent86ed0e9806de37febafbd4664abf48ac6db3034d (diff)
downloadmariadb-git-abf7eb0627d1a652beaa2380dbb94c6ad0ae0a2a.tar.gz
after-merge fix.
Diffstat (limited to 'sql/item_sum.cc')
-rw-r--r--sql/item_sum.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/sql/item_sum.cc b/sql/item_sum.cc
index 8bfac058936..28a9a1f4dbf 100644
--- a/sql/item_sum.cc
+++ b/sql/item_sum.cc
@@ -398,7 +398,8 @@ Field *Item_sum::create_tmp_field(bool group, TABLE *table,
{
switch (result_type()) {
case REAL_RESULT:
- return new Field_double(max_length,maybe_null,name,table,decimals);
+ return new Field_double(max_length, maybe_null, name, table, decimals,
+ TRUE);
case INT_RESULT:
return new Field_longlong(max_length,maybe_null,name,table,unsigned_flag);
case STRING_RESULT:
@@ -1123,7 +1124,7 @@ Field *Item_sum_avg::create_tmp_field(bool group, TABLE *table,
if (hybrid_type == DECIMAL_RESULT)
return new Field_new_decimal(max_length, maybe_null, name, table,
decimals, unsigned_flag);
- return new Field_double(max_length, maybe_null, name, table, decimals);
+ return new Field_double(max_length, maybe_null, name, table, decimals, TRUE);
}
@@ -1317,7 +1318,7 @@ Field *Item_sum_variance::create_tmp_field(bool group, TABLE *table,
*/
return new Field_string(sizeof(double)*2 + sizeof(longlong), 0, name, table, &my_charset_bin);
}
- return new Field_double(max_length, maybe_null,name,table,decimals);
+ return new Field_double(max_length, maybe_null, name, table, decimals, TRUE);
}