diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-05-10 18:17:43 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-05-10 18:17:43 +0300 |
| commit | f34be1893892745b5b1a7a099eab4ad8e9ac8641 (patch) | |
| tree | d7eed818fd8b648e5eabe0dbad53e61665d8dc37 /sql/item_sum.cc | |
| parent | e843297d128b165125d17aab8958f7ca91808923 (diff) | |
| parent | 8882d71f3f1dd03ef98d072def39b29e6a03f5b8 (diff) | |
| download | mariadb-git-f34be1893892745b5b1a7a099eab4ad8e9ac8641.tar.gz | |
Merge with MariaDB 5.2
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 7de02d726fa..51754fbd9ee 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -609,17 +609,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); |