diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-05-03 19:10:10 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-05-03 19:10:10 +0300 |
| commit | 633b07e0abff927fe673b068d5d639cefcb20c75 (patch) | |
| tree | 17ba1ed90233efa64bc83364ed1ffb74dd637ead /sql/item_sum.cc | |
| parent | 0576b10d7b78deba4230a04b8509378aef2725fc (diff) | |
| parent | 774344d9ed9477179b86f575928b56110fe9c3ce (diff) | |
| download | mariadb-git-633b07e0abff927fe673b068d5d639cefcb20c75.tar.gz | |
Merge with MariaDB 5.1
Diffstat (limited to 'sql/item_sum.cc')
| -rw-r--r-- | sql/item_sum.cc | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sql/item_sum.cc b/sql/item_sum.cc index 40ece652ba3..d71258d8748 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -607,17 +607,13 @@ Item_sum_hybrid::fix_fields(THD *thd, Item **ref) switch (hybrid_type= item->result_type()) { case INT_RESULT: - max_length= 20; - break; case DECIMAL_RESULT: + case STRING_RESULT: max_length= item->max_length; break; case REAL_RESULT: max_length= float_length(decimals); break; - case STRING_RESULT: - max_length= item->max_length; - break; case ROW_RESULT: default: DBUG_ASSERT(0); |