diff options
author | unknown <ramil@mysql.com> | 2005-04-27 17:20:29 +0500 |
---|---|---|
committer | unknown <ramil@mysql.com> | 2005-04-27 17:20:29 +0500 |
commit | 77d8d716b4ea5a3b19ab723725550ac4441548c7 (patch) | |
tree | 8a255e8ad92535fbe88fc1586a105d3cff4dfffc /sql | |
parent | 21d5136def8bb0a79b30552443b92f7e8af0ef77 (diff) | |
parent | a437b82affd3323bd02dc60ae0b4565825f1418d (diff) | |
download | mariadb-git-77d8d716b4ea5a3b19ab723725550ac4441548c7.tar.gz |
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/ram/work/4.1.b9803
Diffstat (limited to 'sql')
-rw-r--r-- | sql/item_func.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index eb6e395c266..2b38584fe23 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -1072,6 +1072,8 @@ void Item_func_round::fix_length_and_dec() decimals=0; else decimals=min(tmp,NOT_FIXED_DEC); + if ((tmp= decimals - args[0]->decimals) > 0) + max_length+= tmp; } } |