database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

Merge mysql.com:/home/kostja/mysql/mysql-5.0-root

Browse Source 
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
This commit is contained in:
konstantin@mysql.com
2006-02-09 13:35:59 +03:00
parent 51fda104cc 16edce1e5d
commit e1f807af26
43 changed files with 651 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
sql/item_func.cc
View File

@@ -1865,28 +1865,30 @@ longlong Item_func_round::int_op()
return value; // integer have not digits after point
abs_dec= -dec;
double tmp;
/*
tmp2 is here to avoid return the value with 80 bit precision
This will fix that the test round(0.1,1) = round(0.1,1) is true
*/
volatile double tmp2;
tmp= (abs_dec < array_elements(log_10) ?
log_10[abs_dec] : pow(10.0, (double) abs_dec));
longlong tmp;
if(abs_dec >= array_elements(log_10_int))
return 0;
tmp= log_10_int[abs_dec];
if (truncate)
{
if (unsigned_flag)
tmp2= floor(ulonglong2double(value)/tmp)*tmp;
else if (value >= 0)
tmp2= floor(((double)value)/tmp)*tmp;
value= (ulonglong(value)/tmp)*tmp;
else
tmp2= ceil(((double)value)/tmp)*tmp;
value= (value/tmp)*tmp;
}
else
tmp2= rint(((double)value)/tmp)*tmp;
return (longlong)tmp2;
{
if (unsigned_flag)
value= ((ulonglong(value)+(tmp>>1))/tmp)*tmp;
else if ( value >= 0)
value= ((value+(tmp>>1))/tmp)*tmp;
else
value= ((value-(tmp>>1))/tmp)*tmp;
}
return value;
}