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

80f01958 · Alexey Kopytov · 52fffecb · a81a0158 · 80f01958 · 80f01958
Commit 80f01958 authored Dec 10, 2008 by Alexey Kopytov
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 8 deletions

mysql-test/r/type_float.result mysql-test/r/type_float.result +1 -5

mysql-test/t/type_float.test mysql-test/t/type_float.test +1 -3

No files found.
--- a/mysql-test/r/type_float.result
+++ b/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),
+insert into t1(d) values (9.22337203685479e18),
-(9.223372036854779e18),
-(9.22337203685479e18),
 (1.84e19);
 update t1 set u = d;
 select u from t1;
 u
-9223372036854775808
-9223372036854779904
 9223372036854790144
 18400000000000000000
 drop table t1;

--- a/mysql-test/t/type_float.test
+++ b/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),
+insert into t1(d) values (9.22337203685479e18),
-                         (9.223372036854779e18),
-                         (9.22337203685479e18),
                         (1.84e19);
 update t1 set u = d;