bk commit into 5.1 tree (msvensson:1.2202)

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson 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
  1.2202 06/03/22 16:48:35 msvensson@neptunus.(none) +5 -0
  Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
  into  neptunus.(none):/home/msvensson/mysql/mysql-5.1

  mysql-test/t/variables.test
    1.57 06/03/22 16:48:29 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/type_newdecimal.test
    1.36 06/03/22 16:48:29 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/type_float.test
    1.31 06/03/22 16:48:29 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/fulltext.test
    1.83 06/03/22 16:48:29 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/r/fulltext.result
    1.89 06/03/22 16:48:29 msvensson@neptunus.(none) +0 -0
    Auto merged

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/mysql-5.1/RESYNC

--- 1.35/mysql-test/t/type_newdecimal.test	2005-11-29 13:58:25 +01:00
+++ 1.36/mysql-test/t/type_newdecimal.test	2006-03-22 16:48:29 +01:00
@@ -1050,7 +1050,18 @@
 }
 SELECT my_float, my_double, my_varchar FROM t1;
 
+# Expected result   0.000000000011754943372854760000
+# On windows we get 0.000000000011754943372854770000
+# use replace_result to correct it
+--replace_result 0.000000000011754943372854770000 0.000000000011754943372854760000
+
 SELECT CAST(my_float   AS DECIMAL(65,30)), my_float FROM t1;
+
+# Expected result   0.000000000011754943372854760000
+# On windows we get 0.000000000011754943372854770000
+# use replace_result to correct it
+--replace_result 0.000000000011754943372854770000 0.000000000011754943372854760000
+
 SELECT CAST(my_double  AS DECIMAL(65,30)), my_double FROM t1;
 SELECT CAST(my_varchar AS DECIMAL(65,30)), my_varchar FROM t1;
 

--- 1.88/mysql-test/r/fulltext.result	2006-02-22 10:09:48 +01:00
+++ 1.89/mysql-test/r/fulltext.result	2006-03-22 16:48:29 +01:00
@@ -460,12 +460,12 @@
 DROP TABLE t1;
 CREATE TABLE t1 (a TEXT, FULLTEXT KEY(a));
 INSERT INTO t1 VALUES('test'),('test1'),('test');
-PREPARE stmt from "SELECT a, MATCH(a) AGAINST('test1 test') FROM t1 WHERE MATCH(a) AGAINST('test1 test')";
+PREPARE stmt from "SELECT a, FORMAT(MATCH(a) AGAINST('test1 test'),6) FROM t1 WHERE MATCH(a) AGAINST('test1 test')";
 EXECUTE stmt;
-a	MATCH(a) AGAINST('test1 test')
-test1	0.68526661396027
+a	FORMAT(MATCH(a) AGAINST('test1 test'),6)
+test1	0.685267
 EXECUTE stmt;
-a	MATCH(a) AGAINST('test1 test')
-test1	0.68526661396027
+a	FORMAT(MATCH(a) AGAINST('test1 test'),6)
+test1	0.685267
 DEALLOCATE PREPARE stmt;
 DROP TABLE t1;

--- 1.82/mysql-test/t/fulltext.test	2006-02-14 13:19:40 +01:00
+++ 1.83/mysql-test/t/fulltext.test	2006-03-22 16:48:29 +01:00
@@ -383,7 +383,7 @@
 #
 CREATE TABLE t1 (a TEXT, FULLTEXT KEY(a));
 INSERT INTO t1 VALUES('test'),('test1'),('test');
-PREPARE stmt from "SELECT a, MATCH(a) AGAINST('test1 test') FROM t1 WHERE MATCH(a) AGAINST('test1 test')";
+PREPARE stmt from "SELECT a, FORMAT(MATCH(a) AGAINST('test1 test'),6) FROM t1 WHERE MATCH(a) AGAINST('test1 test')";
 EXECUTE stmt;
 EXECUTE stmt;
 DEALLOCATE PREPARE stmt;

--- 1.30/mysql-test/t/type_float.test	2006-02-08 12:05:11 +01:00
+++ 1.31/mysql-test/t/type_float.test	2006-03-22 16:48:29 +01:00
@@ -116,10 +116,15 @@
 # Check conversion of floats to character field (Bug #7774)
 create table t1 (c char(20));
 insert into t1 values (5e-28);
+# Expected result is "5e-28", but windows returns "5e-028"
+--replace_result 5e-028 5e-28
 select * from t1;
 drop table t1;
 create table t1 (c char(6));
 insert into t1 values (2e5),(2e6),(2e-4),(2e-5);
+# Expected result is "2e+06", but windows returns "2e+006"
+# Expected result is "2e-05", but windows returns "2e-005"
+--replace_result 2e+006 2e+06 2e-005 2e-05
 select * from t1;
 drop table t1;
 

--- 1.56/mysql-test/t/variables.test	2006-02-14 06:40:45 +01:00
+++ 1.57/mysql-test/t/variables.test	2006-03-22 16:48:29 +01:00
@@ -20,6 +20,8 @@
 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;