diff options
| author | unknown <ramil/ram@mysql.com/myoffice.izhnet.ru> | 2006-07-23 12:58:26 +0500 |
|---|---|---|
| committer | unknown <ramil/ram@mysql.com/myoffice.izhnet.ru> | 2006-07-23 12:58:26 +0500 |
| commit | 774300afe4d8a9f2f39f9a9a75e5f03cd9366262 (patch) | |
| tree | 08fa09f5252fbbbbd7c9f4cc92b6b37c3ecbceca /sql/item_sum.cc | |
| parent | 7c7949b05b8e5482bae6967f5bf2de78934dbbef (diff) | |
| parent | 4e846a3d274357de741aa8c53f6eeba04aa00fc9 (diff) | |
| download | mariadb-git-774300afe4d8a9f2f39f9a9a75e5f03cd9366262.tar.gz | |
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into mysql.com:/usr/home/ram/work/5.0.b10966
mysql-test/r/func_group.result:
Auto merged
mysql-test/t/func_group.test:
Auto merged
sql/item_sum.cc:
Auto merged
sql/item_sum.h:
Auto merged
Diffstat (limited to 'sql/item_sum.cc')
| -rw-r--r-- | sql/item_sum.cc | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sql/item_sum.cc b/sql/item_sum.cc index 4d70debb966..898ea28985b 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -1256,9 +1256,6 @@ Field *Item_sum_variance::create_tmp_field(bool group, TABLE *table, sizeof(double)*2) + sizeof(longlong), 0, name, table, &my_charset_bin); } - 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); } |