Commit a1494918 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 

into mishka.local:/home/my/mysql-5.0
parents 1c352901 af6ba386

mysql-test/r/type_newdecimal.result

+3 −0
Original line number Diff line number Diff line
@@ -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

mysql-test/t/type_newdecimal.test

+5 −0
Original line number Diff line number Diff line
@@ -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;

strings/decimal.c

+12 −8
Original line number Diff line number Diff line
@@ -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 */

      {