bzr push into mysql-6.0 branch (alexeyk:2713 to 2714) Bug#8457

[Alexey Kopytov]

 2714 Alexey Kopytov	2008-12-22
      After-merge fix for bug #8457: correctly merged the results file.
modified:
  mysql-test/r/func_math.result

 2713 Alexey Kopytov	2008-12-22 [merge]
      Merge to mysql-6.0-alik.
modified:
  mysql-test/r/func_math.result
  mysql-test/r/type_varchar.result
  mysql-test/t/func_math.test
  sql/item_func.cc

=== 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