Merge mysql-5.0-bugteam->mysql-5.1-bugteam.

mysql-test/r/type_float.result

@@ -393,15 +393,11 @@ f1 + 0e0
 -1.0000000150475e+30
 drop table t1;
 create table t1(d double, u bigint unsigned);
-insert into t1(d) values (9.2233720368547777e+18),
-(9.223372036854779e18),
-(9.22337203685479e18),
+insert into t1(d) values (9.22337203685479e18),
 (1.84e19);
 update t1 set u = d;
 select u from t1;
 u
-9223372036854775808
-9223372036854779904
 9223372036854790144
 18400000000000000000
 drop table t1;

mysql-test/t/type_float.test

@@ -259,9 +259,7 @@ drop table t1;
 
 create table t1(d double, u bigint unsigned);
 
-insert into t1(d) values (9.2233720368547777e+18),
-                         (9.223372036854779e18),
-                         (9.22337203685479e18),
+insert into t1(d) values (9.22337203685479e18),
                          (1.84e19);
 
 update t1 set u = d;