diff --git a/mysql-test/r/merge.result b/mysql-test/r/merge.result index 6cfde286351fd00e763e85a88e84eb05c0bbb38f..d00423ea4bfe7279c0d1923a182bada9f353de16 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 4c1d10b47e3591e4caae14fa44ae299b23b57b03..429013af56f6d78342c1a0ccfd6c6a76034af917 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;