diff options
| author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2011-05-10 16:57:40 +0300 |
|---|---|---|
| committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2011-05-10 16:57:40 +0300 |
| commit | d706f1a768ff59b5f8523811bb4a9406e5d82b38 (patch) | |
| tree | 1810b2ffcaac02578a8a1a932c8a69ce1114d54e /sql/item_sum.cc | |
| parent | 7071a7b2613ae7a69f9a9e157c5faff489f7d5f5 (diff) | |
| parent | 3937f13cd48ee2181b8b0545f8a5156d2ae204ca (diff) | |
| download | mariadb-git-d706f1a768ff59b5f8523811bb4a9406e5d82b38.tar.gz | |
weave merge of mysql-5.1->mysql-5.1-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 f177c98bf65..be06c71372a 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -612,17 +612,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); |