bk commit into 4.1 tree (ingo:1.2457)

[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.2457 05/09/27 15:42:14 ingo@stripped +2 -0
  Merge mysql.com:/home/mydev/mysql-4.0-4000
  into  mysql.com:/home/mydev/mysql-4.1-4100

  mysql-test/t/merge.test
    1.35 05/09/27 15:42:10 ingo@stripped +0 -4
    Bug#9112 - Merge table with composite index producing invalid results with some
queries
    Manual merge

  mysql-test/r/merge.result
    1.37 05/09/27 15:42:10 ingo@stripped +0 -0
    Bug#9112 - Merge table with composite index producing invalid results with some
queries
    Manual merge

# 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.36/mysql-test/r/merge.result	2005-09-23 10:48:57 +02:00
+++ 1.37/mysql-test/r/merge.result	2005-09-27 15:42:10 +02:00
@@ -652,30 +652,30 @@
 ERROR HY000: You can't specify target table 't2' for update in FROM clause
 drop table t1, t2;
 create table t1 (
-a double(16,6),
+a double(14,4),
 b varchar(10),
 index (a,b)
 ) engine=merge union=(t2,t3);
 create table t2 (
-a double(16,6),
+a double(14,4),
 b varchar(10),
 index (a,b)
 ) engine=myisam;
 create table t3 (
-a double(16,6),
+a double(14,4),
 b varchar(10),
 index (a,b)
 ) engine=myisam;
 insert into t2 values ( null, '');
-insert into t2 values ( 9999999999.999999, '');
+insert into t2 values ( 9999999999.9999, '');
 insert into t3 select * from t2;
 select min(a), max(a) from t1;
 min(a)	max(a)
-9999999999.999998	9999999999.999998
+9999999999.9999	9999999999.9999
 flush tables;
 select min(a), max(a) from t1;
 min(a)	max(a)
-9999999999.999998	9999999999.999998
+9999999999.9999	9999999999.9999
 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.34/mysql-test/t/merge.test	2005-09-23 17:22:32 +02:00
+++ 1.35/mysql-test/t/merge.test	2005-09-27 15:42:10 +02:00
@@ -294,29 +294,25 @@
 # non-debug build. But there is no guarantee that this will be always so.
 #
 create table t1 (
- a double(16,6),
+ a double(14,4),
  b varchar(10),
  index (a,b)
 ) engine=merge union=(t2,t3);
 
 create table t2 (
- a double(16,6),
+ a double(14,4),
  b varchar(10),
  index (a,b)
 ) engine=myisam;
 
 create table t3 (
- a double(16,6),
+ a double(14,4),
  b varchar(10),
  index (a,b)
 ) engine=myisam;
 
 insert into t2 values ( null, '');
-# We may have insufficient accuracy for 16 digits of '9'.
-# Suppress a "truncate" warning due to accuracy problems.
---disable_warnings
-insert into t2 values ( 9999999999.999999, '');
---enable_warnings
+insert into t2 values ( 9999999999.9999, '');
 insert into t3 select * from t2;
 select min(a), max(a) from t1;
 flush tables;