mirror of
https://github.com/MariaDB/server.git
synced 2025-01-19 13:32:33 +01:00
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into deer.(none):/home/hf/work/mysql-5.0.clean
This commit is contained in:
commit
9cba39cab4
1 changed files with 2 additions and 1 deletions
|
@ -656,7 +656,8 @@ my_decimal *Item_sum_sum_distinct::val_decimal(my_decimal *fake)
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
double real= val_real();
|
double real= val_real();
|
||||||
double2my_decimal(E_DEC_FATAL_ERROR, real, dec_buffs + curr_dec_buff);
|
curr_dec_buff= 0;
|
||||||
|
double2my_decimal(E_DEC_FATAL_ERROR, real, dec_buffs);
|
||||||
}
|
}
|
||||||
return(dec_buffs + curr_dec_buff);
|
return(dec_buffs + curr_dec_buff);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue