summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorSergey Glukhov <sergey.glukhov@oracle.com>2011-05-26 14:09:25 +0400
committerSergey Glukhov <sergey.glukhov@oracle.com>2011-05-26 14:09:25 +0400
commit9d42d36e7e54c2a8a62fc11e094a845a5a5c332b (patch)
treeca30427efcd036da385b9a8da3d1754596eb1cc6 /mysql-test
parentb5009ee6bef7c074ff067ef2aab5f63f00a7ee54 (diff)
parent3efbf30457d76a3e47371f6d4bd4b2ebd7141ffd (diff)
downloadmariadb-git-9d42d36e7e54c2a8a62fc11e094a845a5a5c332b.tar.gz
5.1 -> 5.5 merge
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/func_math.result6
-rw-r--r--mysql-test/t/func_math.test6
2 files changed, 12 insertions, 0 deletions
diff --git a/mysql-test/r/func_math.result b/mysql-test/r/func_math.result
index ac24ef4dea9..c93e33f98b9 100644
--- a/mysql-test/r/func_math.result
+++ b/mysql-test/r/func_math.result
@@ -543,6 +543,12 @@ ROUND(LEAST(15, -4939092, 0.2704), STDDEV('a'))
-4939092.0000
Warnings:
Warning 1292 Truncated incorrect DOUBLE value: 'a'
+#
+# Bug#12392636 ASSERTION FAILED: SCALE >= 0 && PRECISION > 0 && SCALE <= PRECISION
+#
+SELECT SUM(DISTINCT (TRUNCATE((.1), NULL)));
+SUM(DISTINCT (TRUNCATE((.1), NULL)))
+NULL
End of 5.1 tests
#
# Bug #8433: Overflow must be an error
diff --git a/mysql-test/t/func_math.test b/mysql-test/t/func_math.test
index 0e704fecf57..0d59f98a313 100644
--- a/mysql-test/t/func_math.test
+++ b/mysql-test/t/func_math.test
@@ -370,6 +370,12 @@ DROP TABLE t1;
SELECT ROUND(LEAST(15, -4939092, 0.2704), STDDEV('a'));
+--echo #
+--echo # Bug#12392636 ASSERTION FAILED: SCALE >= 0 && PRECISION > 0 && SCALE <= PRECISION
+--echo #
+
+SELECT SUM(DISTINCT (TRUNCATE((.1), NULL)));
+
--echo End of 5.1 tests
--echo #