Merge mysql.com:/home/hf/work/27984/my50-27984

into  mysql.com:/home/hf/work/27984/my51-27984

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;