summaryrefslogtreecommitdiff
path: root/mysql-test/r/func_math.result
diff options
context:
space:
mode:
authorAlexey Kopytov <Alexey.Kopytov@Sun.com>2009-11-21 19:46:50 +0300
committerAlexey Kopytov <Alexey.Kopytov@Sun.com>2009-11-21 19:46:50 +0300
commit218fc570a6e7f8c84623b4fdbcd4305ac0bfd35a (patch)
tree7a8e0474b1004aa36fdd8626824bd7c4818a0c6f /mysql-test/r/func_math.result
parent425157eee3f2a5826b27d7b2fa6b11d8d2c56999 (diff)
parent177ed0667e128fc2533fae1f4fd520945f40c0a8 (diff)
downloadmariadb-git-218fc570a6e7f8c84623b4fdbcd4305ac0bfd35a.tar.gz
Merged from mysql-next-mr-bugfixing.
Updated the result file for func_math.
Diffstat (limited to 'mysql-test/r/func_math.result')
-rw-r--r--mysql-test/r/func_math.result2
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/r/func_math.result b/mysql-test/r/func_math.result
index f469564c78b..063f4d37f4a 100644
--- a/mysql-test/r/func_math.result
+++ b/mysql-test/r/func_math.result
@@ -384,7 +384,9 @@ y
0
Warnings:
Warning 1366 Incorrect decimal value: '' for column '' at row -1
+Warning 1292 Truncated incorrect DECIMAL value: 'str1'
Warning 1366 Incorrect decimal value: '' for column '' at row -1
+Warning 1292 Truncated incorrect DECIMAL value: 'str2'
SELECT c DIV 900 y FROM t1 GROUP BY y;
y
0