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

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

3 files changed, 10 insertions, 1 deletions

diff --git a/mysql-test/r/type_newdecimal.result b/mysql-test/r/type_newdecimal.result
index 855c452cb21..8405ec9782c 100644
--- a/mysql-test/r/type_newdecimal.result
+++ b/mysql-test/r/type_newdecimal.result
@@ -1475,6 +1475,9 @@ Error	1264	Out of range value for column 'cast(a as DECIMAL(3,2))' at row 1
 Error	1264	Out of range value for column 'cast(a as DECIMAL(3,2))' at row 1
 Error	1264	Out of range value for column 'cast(a as DECIMAL(3,2))' at row 1
 Error	1264	Out of range value for column 'cast(a as DECIMAL(3,2))' at row 1
+SELECT 1.000000000000 * 99.999999999998 / 100 a,1.000000000000 * (99.999999999998 / 100) b;
+a	b
+0.9999999999999800000000000000	0.9999999999999800000000000000
 End of 5.0 tests
 select cast(143.481 as decimal(4,1));
 cast(143.481 as decimal(4,1))
diff --git a/mysql-test/t/type_newdecimal.test b/mysql-test/t/type_newdecimal.test
index 0a52bdaa8e6..566682d8e58 100644
--- a/mysql-test/t/type_newdecimal.test
+++ b/mysql-test/t/type_newdecimal.test
@@ -1159,6 +1159,11 @@ select cast(a as DECIMAL(3,2)), count(*)
   UNION select 12.1234
  ) t group by 1;
 
+#
+# Bug #27984 Long Decimal Maths produces truncated results 
+#
+
+SELECT 1.000000000000 * 99.999999999998 / 100 a,1.000000000000 * (99.999999999998 / 100) b;
 --echo End of 5.0 tests
 
 #
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;