Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0

into sanja.is.com.ua:/home/bell/mysql/bk/work-error-5.0

mysql-test/t/strict.test

@@ -405,10 +405,13 @@ INSERT INTO t1 (col1) VALUES('9223372036854775808');
 INSERT INTO t1 (col2) VALUES('-1');
 --error 1264
 INSERT INTO t1 (col2) VALUES('18446744073709551616');
+
+# Note that the following two double numbers are slighty bigger than max/min
+# bigint becasue of rounding errors when converting it to bigint
 --error 1264
-INSERT INTO t1 (col1) VALUES(-9223372036854775809.0);
+INSERT INTO t1 (col1) VALUES(-9223372036854785809.0);
 --error 1264
-INSERT INTO t1 (col1) VALUES(9223372036854775808.0);
+INSERT INTO t1 (col1) VALUES(9223372036854785808.0);
 --error 1264
 INSERT INTO t1 (col2) VALUES(-1.0);
 --error 1264
@@ -432,7 +435,7 @@ INSERT IGNORE INTO t1 (col1) VALUES ('2a');
 INSERT IGNORE INTO t1 values (1/0,1/0);
 INSERT IGNORE INTO t1 VALUES(-9223372036854775809,-1),(9223372036854775808,18446744073709551616);
 INSERT IGNORE INTO t1 VALUES('-9223372036854775809','-1'),('9223372036854775808','18446744073709551616');
-INSERT IGNORE INTO t1 VALUES(-9223372036854775809.0,-1.0),(9223372036854775808.0,18446744073709551616.0);
+INSERT IGNORE INTO t1 VALUES(-9223372036854785809.0,-1.0),(9223372036854785808.0,18446744073709551616.0);
 UPDATE IGNORE t1 SET col2=1/NULL where col1=0;
 SELECT * FROM t1;
 DROP TABLE t1;