From: Alexey Kopytov Date: December 22 2008 12:45pm Subject: bzr commit into mysql-6.0 branch (alexeyk:2714) Bug#8457 List-Archive: http://lists.mysql.com/commits/62210 X-Bug: 8457 Message-Id: <20081222124510.5AEBA8E104F@mbp.local> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit #At file:///Users/kaa/src/bzr/mysql-6.0-alik/ 2714 Alexey Kopytov 2008-12-22 After-merge fix for bug #8457: correctly merged the results file. modified: mysql-test/r/func_math.result per-file messages: mysql-test/r/func_math.result Correctly merged the results file. === modified file 'mysql-test/r/func_math.result' --- a/mysql-test/r/func_math.result 2008-12-22 10:11:13 +0000 +++ b/mysql-test/r/func_math.result 2008-12-22 12:44:57 +0000 @@ -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