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

compare with DIG_BASE corectly

Browse Source 
rounding bugs fixed
This commit is contained in:
serg@serg.mylan
2004-10-31 21:30:19 +01:00
parent afd18341ac
commit b0045f9e00
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
strings/decimal.c
View File

@@ -468,7 +468,7 @@ static int ull2dec(ulonglong from, decimal *to)
sanity(to); sanity(to);
for (intg1=1; from > DIG_BASE; intg1++, from/=DIG_BASE); for (intg1=1; from >= DIG_BASE; intg1++, from/=DIG_BASE);
if (unlikely(intg1 > to->len)) if (unlikely(intg1 > to->len))
{ {
intg1=to->len; intg1=to->len;
@@ -880,20 +880,17 @@ int decimal_round(decimal *from, decimal *to, int scale, decimal_round_mode mode
y=x % 10; y=x % 10;
if (y > 5 || (y == 5 && (mode == HALF_UP || (x/10) & 1))) if (y > 5 || (y == 5 && (mode == HALF_UP || (x/10) & 1)))
x+=10; x+=10;
*buf1=x*powers10[pos]-y; *buf1=powers10[pos]*(x-y);
} }
else else
*buf1=(*buf1/powers10[pos+1])*powers10[pos+1]; *buf1=(*buf1/powers10[pos+1])*powers10[pos+1];
} }
if (*buf1 > DIG_BASE) if (*buf1 >= DIG_BASE)
{ {
carry=1; carry=1;
*buf1-=DIG_BASE; *buf1-=DIG_BASE;
while (carry && buf1 >= to->buf) while (carry && --buf1 >= to->buf)
{
ADD(*buf1, *buf1, 0, carry); ADD(*buf1, *buf1, 0, carry);
buf1--;
}
if (unlikely(carry)) if (unlikely(carry))
{ {
/* shifting the number to create space for new digit */ /* shifting the number to create space for new digit */
@@ -1407,7 +1404,7 @@ static int do_div_mod(decimal *from1, decimal *from2,
dlen1=len2; dlen1=len2;
} }
guess=(norm_factor*x+norm_factor*y/DIG_BASE)/norm2; guess=(norm_factor*x+norm_factor*y/DIG_BASE)/norm2;
if (unlikely(guess > DIG_BASE)) if (unlikely(guess >= DIG_BASE))
guess=DIG_BASE-1; guess=DIG_BASE-1;
if (likely(len2>1)) if (likely(len2>1))
{ {