diff options
| author | Kent Boortz <kent.boortz@oracle.com> | 2011-07-03 17:47:37 +0200 |
|---|---|---|
| committer | Kent Boortz <kent.boortz@oracle.com> | 2011-07-03 17:47:37 +0200 |
| commit | b6e6097c95eee4f453c117c298ee6a03fdcd499d (patch) | |
| tree | 448d397ed328f719a29a8fbbd54df8d943ed7274 /sql/item_sum.cc | |
| parent | 1400d7a2cc33fd158efcb3bd638c4ee4c8762207 (diff) | |
| parent | 8e14d52610d747977bcbe2875cbe7d93724d8143 (diff) | |
| download | mariadb-git-b6e6097c95eee4f453c117c298ee6a03fdcd499d.tar.gz | |
Updated/added copyright headers
Diffstat (limited to 'sql/item_sum.cc')
| -rw-r--r-- | sql/item_sum.cc | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/sql/item_sum.cc b/sql/item_sum.cc index 2a8aea68f7a..d480fae8a4c 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -1,4 +1,4 @@ -/* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -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); |