diff options
| author | Evgeny Potemkin <epotemkin@mysql.com> | 2009-11-24 18:30:21 +0300 |
|---|---|---|
| committer | Evgeny Potemkin <epotemkin@mysql.com> | 2009-11-24 18:30:21 +0300 |
| commit | 8af680218ef330e58277ada13220d85218c6c48b (patch) | |
| tree | 5b32a8b62b786f3c6c9b0c6e4c418dec63dc07d0 /sql/item_sum.cc | |
| parent | 9f638f535e63b4bbe7cddfda153ddedad02f3f8a (diff) | |
| parent | a21cd97c3506a70297afc3dd3f64cdfd2dc0a4e6 (diff) | |
| download | mariadb-git-8af680218ef330e58277ada13220d85218c6c48b.tar.gz | |
Auto-merge.
Diffstat (limited to 'sql/item_sum.cc')
| -rw-r--r-- | sql/item_sum.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sql/item_sum.cc b/sql/item_sum.cc index 555f20e1ffc..4ab8e75ddf5 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -517,8 +517,7 @@ Field *Item_sum::create_tmp_field(bool group, TABLE *table, name, table->s, collation.collation); break; case DECIMAL_RESULT: - field= new Field_new_decimal(max_length, maybe_null, name, - decimals, unsigned_flag); + field= Field_new_decimal::create_from_item(this); break; case ROW_RESULT: default: @@ -1262,8 +1261,7 @@ Field *Item_sum_avg::create_tmp_field(bool group, TABLE *table, 0, name, &my_charset_bin); } else if (hybrid_type == DECIMAL_RESULT) - field= new Field_new_decimal(max_length, maybe_null, name, - decimals, unsigned_flag); + field= Field_new_decimal::create_from_item(this); else field= new Field_double(max_length, maybe_null, name, decimals, TRUE); if (field) |