diff options
| author | unknown <bell@sanja.is.com.ua> | 2004-11-09 18:05:32 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2004-11-09 18:05:32 +0200 |
| commit | 591feb1fbc3632da62620e81ac39e8a0e307aa84 (patch) | |
| tree | 42fc87719c926b737a298e459367879147d26b66 /strings | |
| parent | 753dc116a3fd124c1dd41b1ac21e85c4547fdfa9 (diff) | |
| parent | 77b011c6b969da5d48d16a8c7714aac99b9fc4c2 (diff) | |
| download | mariadb-git-591feb1fbc3632da62620e81ac39e8a0e307aa84.tar.gz | |
Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
Diffstat (limited to 'strings')
| -rw-r--r-- | strings/decimal.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/strings/decimal.c b/strings/decimal.c index 3d3ddc36116..09f6cb6bb51 100644 --- a/strings/decimal.c +++ b/strings/decimal.c @@ -921,6 +921,8 @@ int decimal_round(decimal *from, decimal *to, int scale, decimal_round_mode mode *buf1-=DIG_BASE; while (carry && --buf1 >= to->buf) ADD(*buf1, *buf1, 0, carry); + if (to->buf[0] > from->buf[0]) + to->intg++; if (unlikely(carry)) { /* shifting the number to create space for new digit */ @@ -1150,6 +1152,8 @@ static int do_sub(decimal *from1, decimal *from2, decimal *to) buf1=start1+intg1+frac1; stop1=start1+intg1+frac2; buf2=start2+intg2+frac2; + while (frac0-- > frac1) + *--buf0=0; while (buf1 > stop1) *--buf0=*--buf1; } @@ -1158,6 +1162,8 @@ static int do_sub(decimal *from1, decimal *from2, decimal *to) buf1=start1+intg1+frac1; buf2=start2+intg2+frac2; stop2=start2+intg2+frac1; + while (frac0-- > frac2) + *--buf0=0; while (buf2 > stop2) { SUB(*--buf0, 0, *--buf2, carry); @@ -1968,6 +1974,7 @@ main() test_ds("-123.45", "-12345"); test_da("123.45", "-12345"); test_da("-123.45", "12345"); + test_da("5", "-6.0"); printf("==== decimal_mul ====\n"); test_dm("12", "10"); @@ -2059,6 +2066,9 @@ main() test_ro("-15.1",0,CEILING); test_ro("15.1",0,FLOOR); test_ro("-15.1",0,FLOOR); + test_ro("999999999999999999999.999", 0, CEILING); + test_ro("-999999999999999999999.999", 0, FLOOR); + return 0; } |