diff options
| author | unknown <mhansson/martin@linux-st28.site> | 2007-03-22 10:58:16 +0100 |
|---|---|---|
| committer | unknown <mhansson/martin@linux-st28.site> | 2007-03-22 10:58:16 +0100 |
| commit | 5b86ad19da5811fe981e5a6768fb7aef206f9a88 (patch) | |
| tree | a96b9c3876a24db72a46a3fa1f18d0dd6eb4f172 /sql/item_sum.cc | |
| parent | a4a23fb907ce7b2c3e998735e074da647b3e9ffc (diff) | |
| parent | aa3233619874c3bfee4d43957148ef2c7904aa6c (diff) | |
| download | mariadb-git-5b86ad19da5811fe981e5a6768fb7aef206f9a88.tar.gz | |
Merge mhansson@bk-internal:/home/bk/mysql-5.0-opt
into linux-st28.site:/home/martin/mysql/src/5.0o-bug24791
sql/field.h:
Auto merged
sql/item_sum.cc:
Auto merged
Diffstat (limited to 'sql/item_sum.cc')
| -rw-r--r-- | sql/item_sum.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/item_sum.cc b/sql/item_sum.cc index fcebc89c6e9..65e680f183a 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -1121,8 +1121,10 @@ void Item_sum_avg::fix_length_and_dec() f_scale= args[0]->decimals; dec_bin_size= my_decimal_get_binary_size(f_precision, f_scale); } - else + else { decimals= min(args[0]->decimals + prec_increment, NOT_FIXED_DEC); + max_length= args[0]->max_length + prec_increment; + } } |