database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0

Browse Source 
into deer.(none):/home/hf/work/mysql-5.0.10632
This commit is contained in:
hf@deer.(none)
2005-06-15 19:56:01 +05:00
parent f7cccd7ea8 f1fb785b12
commit 38aa20d380
3 changed files with 38 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
strings/decimal.c
View File

@ -1490,11 +1490,31 @@ decimal_round(decimal_t *from, decimal_t *to, int scale,
buf1+=intg0+frac0-1;
if (scale == frac0*DIG_PER_DEC1)
{
int do_inc= FALSE;
DBUG_ASSERT(frac0+intg0 >= 0);
x=buf0[1]/DIG_MASK;
if (x > round_digit ||
(round_digit == 5 && x == 5 && (mode == HALF_UP ||
(frac0+intg0 > 0 && *buf0 & 1))))
switch (round_digit)
{
case 0:
{
dec1 *p0= buf0 + (frac1-frac0);
for (; p0 > buf0; p0--)
if (*p0)
{
do_inc= TRUE;
break;
};
break;
}
case 5:
{
x= buf0[1]/DIG_MASK;
do_inc= (x>5) || ((x == 5) &&
(mode == HALF_UP || (frac0+intg0 > 0 && *buf0 & 1)));
break;
};
default:;
};
if (do_inc)
{
if (frac0+intg0>0)
(*buf1)++;
@ -1509,6 +1529,7 @@ decimal_round(decimal_t *from, decimal_t *to, int scale,
}
else
{
/* TODO - fix this code as it won't work for CEILING mode */
int pos=frac0*DIG_PER_DEC1-scale-1;
DBUG_ASSERT(frac0+intg0 > 0);
x=*buf1 / powers10[pos];