Merge polly.(none):/home/kaa/src/maint/bug26788/my51-bug26788

into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint


mysql-test/t/insert.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/field.cc:
  Auto merged

2 files changed, 5 insertions, 0 deletions

diff --git a/mysql-test/t/insert.test b/mysql-test/t/insert.test
index 474929cacfe..c58fb61ad30 100644
--- a/mysql-test/t/insert.test
+++ b/mysql-test/t/insert.test
@@ -457,6 +457,9 @@ INSERT INTO t1(a,c) VALUES (-1.87e-2, -1.87e-2);
 INSERT INTO t1(a,c) VALUES (5000e+0, 5000e+0);
 INSERT INTO t1(a,c) VALUES (-5000e+0, -5000e+0);
 
+# Expected results are "12.2" and "1.2e+78", but Windows returns "12.3" and
+# "1.3e+78" due to different rounding rules
+--replace_result 12.3 12.2 1.3e+78 1.2e+78
 SELECT * FROM t1;
 
 DROP TABLE t1;
diff --git a/mysql-test/t/variables.test b/mysql-test/t/variables.test
index 310e3e2233c..f474d166fae 100644
--- a/mysql-test/t/variables.test
+++ b/mysql-test/t/variables.test
@@ -50,6 +50,8 @@ select @test, @`test`, @TEST, @`TEST`, @"teSt";
 set @select=2,@t5=1.23456;
 select @`select`,@not_used;
 set @test_int=10,@test_double=1e-10,@test_string="abcdeghi",@test_string2="abcdefghij",@select=NULL;
+# Expected result "1e-10", windows returns "1e-010"
+--replace_result 1e-010 1e-10
 select @test_int,@test_double,@test_string,@test_string2,@select;
 set @test_int="hello",@test_double="hello",@test_string="hello",@test_string2="hello";
 select @test_int,@test_double,@test_string,@test_string2;