From 629697e59406aa32e7e43371e767269ff98e6161 Mon Sep 17 00:00:00 2001
From: unknown <ingo@mysql.com>
Date: Tue, 27 Sep 2005 15:26:16 +0200
Subject: [PATCH] Bug#9112 - Merge table with composite index producing invalid
 results with some queries Reduced the precision of the test numbers. Not all
 platforms could reproduce the exact numbers.

mysql-test/r/merge.result:
  Bug#9112 - Merge table with composite index producing invalid results with some queries
  The new test result
---
 mysql-test/r/merge.result | 12 ++++++------
 mysql-test/t/merge.test   |  8 ++++----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/mysql-test/r/merge.result b/mysql-test/r/merge.result
index 6cfde286351..d00423ea4bf 100644
--- a/mysql-test/r/merge.result
+++ b/mysql-test/r/merge.result
@@ -620,28 +620,28 @@ create table t3 engine=merge union=(t1, t2) select * from t2;
 INSERT TABLE 't2' isn't allowed in FROM table list
 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;
diff --git a/mysql-test/t/merge.test b/mysql-test/t/merge.test
index 4c1d10b47e3..429013af56f 100644
--- a/mysql-test/t/merge.test
+++ b/mysql-test/t/merge.test
@@ -273,25 +273,25 @@ drop table t1, t2;
 # 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, '');
-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;
 flush tables;