bk commit into 6.0 tree (kaa:1.2595) BUG#15936

[Alexey Kopytov]

Below is the list of changes that have just been committed into a local
6.0 repository of kaa.  When kaa does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-04-07 22:24:31+04:00, kaa@kaamos.(none) +1 -0
  Post-merge fix for bug #15936.

  mysql-test/r/func_math.result@stripped, 2008-04-07 22:24:30+04:00, kaa@kaamos.(none) +4 -4
    Post-merge fix for bug #15936.

diff -Nrup a/mysql-test/r/func_math.result b/mysql-test/r/func_math.result
--- a/mysql-test/r/func_math.result	2008-04-07 20:00:48 +04:00
+++ b/mysql-test/r/func_math.result	2008-04-07 22:24:30 +04:00
@@ -432,10 +432,10 @@ a	ROUND(a)
 2.5	2
 -2.9	-3
 2.9	3
--1e+16	-10000000000000000
-1e+16	10000000000000000
--1e+16	-10000000000000002
-1e+16	10000000000000002
+-1e16	-10000000000000000
+1e16	10000000000000000
+-1.0000000000000002e16	-10000000000000002
+1.0000000000000002e16	10000000000000002
 DROP TABLE t1;
 End of 5.0 tests
 SELECT 1e308 + 1e308;