bk commit into 4.1 tree (ingo:1.2460) BUG#9112

[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.2460 05/09/23 17:22:36 ingo@stripped +1 -0
  Bug#9112 - Merge table with composite index producing invalid results with some queries
  After merge fix

  mysql-test/t/merge.test
    1.34 05/09/23 17:22:32 ingo@stripped +4 -0
    Bug#9112 - Merge table with composite index producing invalid results with some
queries
    After merge fix

# 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

--- 1.33/mysql-test/t/merge.test	2005-09-23 10:48:57 +02:00
+++ 1.34/mysql-test/t/merge.test	2005-09-23 17:22:32 +02:00
@@ -312,7 +312,11 @@
 ) 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 t3 select * from t2;
 select min(a), max(a) from t1;
 flush tables;