diff options
| author | Mikael Ronstrom <mikael.ronstrom@oracle.com> | 2011-05-04 11:08:07 +0200 |
|---|---|---|
| committer | Mikael Ronstrom <mikael.ronstrom@oracle.com> | 2011-05-04 11:08:07 +0200 |
| commit | b444c4f2d3e1020a5469f12e5ae460be85925c10 (patch) | |
| tree | 1d793c1b656afcb9c915a1ee3bf5ec796c2fcf78 /sql/item_func.cc | |
| parent | a24ba2276261d48f8a2e46342c7cdb1ee18a8be3 (diff) | |
| parent | 0e647bc72d5e261e11245bf512e5ea37245ea90f (diff) | |
| download | mariadb-git-b444c4f2d3e1020a5469f12e5ae460be85925c10.tar.gz | |
merge
Diffstat (limited to 'sql/item_func.cc')
| -rw-r--r-- | sql/item_func.cc | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index 3fca22e0aaa..9035d644962 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -2409,10 +2409,7 @@ my_decimal *Item_func_round::decimal_op(my_decimal *decimal_value) if (!(null_value= (args[0]->null_value || args[1]->null_value || my_decimal_round(E_DEC_FATAL_ERROR, value, (int) dec, truncate, decimal_value) > 1))) - { - decimal_value->frac= decimals; return decimal_value; - } return 0; } |