summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <monty@mishka.local>2005-05-07 10:00:34 +0300
committerunknown <monty@mishka.local>2005-05-07 10:00:34 +0300
commita1494918f3d93a73ba48c5c100a95d4cf85727da (patch)
tree0f78f58c56980c2865a83e69e65d1cb64b3653f7 /mysql-test
parent1c3529013acd1bf7f811bc782289504dbf038d7e (diff)
parentaf6ba3866d98a037b5798b0abff2410c4ff91156 (diff)
downloadmariadb-git-a1494918f3d93a73ba48c5c100a95d4cf85727da.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mishka.local:/home/my/mysql-5.0
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/type_newdecimal.result3
-rw-r--r--mysql-test/t/type_newdecimal.test5
2 files changed, 8 insertions, 0 deletions
diff --git a/mysql-test/r/type_newdecimal.result b/mysql-test/r/type_newdecimal.result
index 840073aed29..a922ed04826 100644
--- a/mysql-test/r/type_newdecimal.result
+++ b/mysql-test/r/type_newdecimal.result
@@ -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
diff --git a/mysql-test/t/type_newdecimal.test b/mysql-test/t/type_newdecimal.test
index 75f35ba0796..0a152cb339e 100644
--- a/mysql-test/t/type_newdecimal.test
+++ b/mysql-test/t/type_newdecimal.test
@@ -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;