diff options
| author | unknown <holyfoot/hf@hfmain.(none)> | 2007-05-21 22:24:31 +0500 |
|---|---|---|
| committer | unknown <holyfoot/hf@hfmain.(none)> | 2007-05-21 22:24:31 +0500 |
| commit | 322265882f1198a374f7002b0e85f89569e8ea2a (patch) | |
| tree | e6159e899d8caf84076c1ce4f026423779d94741 /strings/decimal.c | |
| parent | d200346edfaddcae88528ebb54ef634b09b8bdca (diff) | |
| parent | cfb9378b3d7a1041752f0e2099494ec20d970baf (diff) | |
| download | mariadb-git-322265882f1198a374f7002b0e85f89569e8ea2a.tar.gz | |
Merge mysql.com:/home/hf/work/27984/my50-27984
into mysql.com:/home/hf/work/27984/my51-27984
mysql-test/t/type_newdecimal.test:
Auto merged
strings/decimal.c:
Auto merged
mysql-test/r/type_newdecimal.result:
merging
Diffstat (limited to 'strings/decimal.c')
| -rw-r--r-- | strings/decimal.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/strings/decimal.c b/strings/decimal.c index 0768c8cd4ca..09d535f3f22 100644 --- a/strings/decimal.c +++ b/strings/decimal.c @@ -1523,9 +1523,10 @@ decimal_round(decimal_t *from, decimal_t *to, int scale, dec1 *p0= buf0+intg0+max(frac1, frac0); dec1 *p1= buf1+intg1+max(frac1, frac0); - to->buf[0]= 0; while (buf0 < p0) *(--p1) = *(--p0); + if (unlikely(intg1 > intg0)) + to->buf[0]= 0; intg0= intg1; buf0=to->buf; |