diff options
| author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2011-05-10 17:20:26 +0300 |
|---|---|---|
| committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2011-05-10 17:20:26 +0300 |
| commit | c4c808d6066f8754d5504eeca0449d42ac95f8b5 (patch) | |
| tree | dedfe71cc0ebd78c6ac5ec49fb9a366ff76a4bf1 /sql/item_sum.cc | |
| parent | 7bc16d29747738c4436e10d5cb27738466079906 (diff) | |
| parent | 5ebd07b0f6e3e6a37b8847a0e05753edc5025f59 (diff) | |
| download | mariadb-git-c4c808d6066f8754d5504eeca0449d42ac95f8b5.tar.gz | |
weave merge of mysql-5.5->mysql-5.5-security
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 42088616f4a..b0ab436ea4a 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -1145,17 +1145,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); |