mirror of
https://github.com/MariaDB/server.git
synced 2026-04-21 07:45:32 +02:00
Merge from 5.0-bt
This commit is contained in:
parent
5e0c653f03
commit
19dfaa5824
40 changed files with 254 additions and 224 deletions
|
|
@ -306,7 +306,7 @@ int decimal_actual_fraction(decimal_t *from)
|
|||
{
|
||||
for (i= DIG_PER_DEC1 - ((frac - 1) % DIG_PER_DEC1);
|
||||
*buf0 % powers10[i++] == 0;
|
||||
frac--);
|
||||
frac--) ;
|
||||
}
|
||||
return frac;
|
||||
}
|
||||
|
|
@ -500,7 +500,7 @@ static void digits_bounds(decimal_t *from, int *start_result, int *end_result)
|
|||
stop= (int) ((buf_end - from->buf + 1) * DIG_PER_DEC1);
|
||||
i= 1;
|
||||
}
|
||||
for (; *buf_end % powers10[i++] == 0; stop--);
|
||||
for (; *buf_end % powers10[i++] == 0; stop--) ;
|
||||
*end_result= stop; /* index of position after last decimal digit (from 0) */
|
||||
}
|
||||
|
||||
|
|
@ -1005,7 +1005,7 @@ static int ull2dec(ulonglong from, decimal_t *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))
|
||||
{
|
||||
intg1=to->len;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue