mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 03:52:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

merging

Browse source 
strings/decimal.c:
  Auto merged
This commit is contained in:
unknown 2005-05-06 20:31:50 +05:00
commit 843b47b16b
3 changed files with 20 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
mysql-test/r/type_newdecimal.result
View file

@ -857,3 +857,6 @@ NULL
Warnings:
Error 1292 Truncated incorrect DECIMAL value: ''
Error 1292 Truncated incorrect DECIMAL value: ''
select 0.190287977636363637 + 0.040372670 * 0 - 0;
0.190287977636363637 + 0.040372670 * 0 - 0
0.190287977636363637

5
mysql-test/t/type_newdecimal.test
View file

@ -882,3 +882,8 @@ select 0/0;
#
select 9999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999 as x;
select 9999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999 + 1 as x;
#
# Bug #10004
#
select 0.190287977636363637 + 0.040372670 * 0 - 0;

20
strings/decimal.c
View file

@ -1709,19 +1709,23 @@ static int do_sub(decimal_t *from1, decimal_t *from2, decimal_t *to)
carry=1;
else if (intg2 == intg1)
{
while (unlikely(stop1[frac1-1] == 0))
frac1--;
while (unlikely(stop2[frac2-1] == 0))
frac2--;
while (buf1 < stop1+frac1 && buf2 < stop2+frac2 && *buf1 == *buf2)
dec1 *end1= stop1 + (frac1 - 1);
dec1 *end2= stop2 + (frac2 - 1);
while (unlikely((buf1 <= end1) && (*end1 == 0)))
end1--;
while (unlikely((buf2 <= end2) && (*end2 == 0)))
end2--;
frac1= (end1 - stop1) + 1;
frac2= (end2 - stop2) + 1;
while (buf1 <=end1 && buf2 <= end2 && *buf1 == *buf2)
buf1++, buf2++;
if (buf1 < stop1+frac1)
if (buf2 < stop2+frac2)
if (buf1 <= end1)
if (buf2 <= end2)
carry= *buf2 > *buf1;
else
carry= 0;
else
if (buf2 < stop2+frac2)
if (buf2 <= end2)
carry=1;
else /* short-circuit everything: from1 == from2 */
{