bk commit into 4.1 tree (ingo:1.2461)

[ingo]

Below is the list of changes that have just been committed into a local
4.1 repository of mydev. When mydev 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.2461 05/09/29 13:44:17 ingo@stripped +2 -0
  Merge mysql.com:/home/mydev/mysql-4.0-4000
  into  mysql.com:/home/mydev/mysql-4.1-4100

  mysql-test/r/merge.result
    1.38 05/09/29 13:44:12 ingo@stripped +0 -0
    SCCS merged

  mysql-test/t/merge.test
    1.36 05/09/29 13:43:26 ingo@stripped +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:	ingo
# Host:	chilla.local
# Root:	/home/mydev/mysql-4.1-4100/RESYNC

--- 1.37/mysql-test/r/merge.result	2005-09-27 15:42:10 +02:00
+++ 1.38/mysql-test/r/merge.result	2005-09-29 13:44:12 +02:00
@@ -667,15 +667,15 @@
 index (a,b)
 ) engine=myisam;
 insert into t2 values ( null, '');
-insert into t2 values ( 9999999999.9999, '');
+insert into t2 values ( 9999999999.999, '');
 insert into t3 select * from t2;
 select min(a), max(a) from t1;
 min(a)	max(a)
-9999999999.9999	9999999999.9999
+9999999999.9990	9999999999.9990
 flush tables;
 select min(a), max(a) from t1;
 min(a)	max(a)
-9999999999.9999	9999999999.9999
+9999999999.9990	9999999999.9990
 drop table t1, t2, t3;
 create table t1 (a int,b int,c int, index (a,b,c));
 create table t2 (a int,b int,c int, index (a,b,c));

--- 1.35/mysql-test/t/merge.test	2005-09-27 15:42:10 +02:00
+++ 1.36/mysql-test/t/merge.test	2005-09-29 13:43:26 +02:00
@@ -312,7 +312,7 @@
 ) engine=myisam;
 
 insert into t2 values ( null, '');
-insert into t2 values ( 9999999999.9999, '');
+insert into t2 values ( 9999999999.999, '');
 insert into t3 select * from t2;
 select min(a), max(a) from t1;
 flush tables;