diff options
| author | unknown <ingo@mysql.com> | 2005-09-29 13:44:17 +0200 |
|---|---|---|
| committer | unknown <ingo@mysql.com> | 2005-09-29 13:44:17 +0200 |
| commit | 48838170c7d160b618713a698e33884e3fb10c98 (patch) | |
| tree | 07761e7efc410355e08244159e4336816a987852 /mysql-test/r/merge.result | |
| parent | f3ad7320523e341efeadfa46ef88a224a80d6dfd (diff) | |
| parent | a671075d3e11a30a117a919a7b9b32de08e0265a (diff) | |
| download | mariadb-git-48838170c7d160b618713a698e33884e3fb10c98.tar.gz | |
Merge mysql.com:/home/mydev/mysql-4.0-4000
into mysql.com:/home/mydev/mysql-4.1-4100
mysql-test/t/merge.test:
Auto merged
mysql-test/r/merge.result:
SCCS merged
Diffstat (limited to 'mysql-test/r/merge.result')
| -rw-r--r-- | mysql-test/r/merge.result | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/r/merge.result b/mysql-test/r/merge.result index 86e6e943074..3035908688a 100644 --- a/mysql-test/r/merge.result +++ b/mysql-test/r/merge.result @@ -667,15 +667,15 @@ b varchar(10), 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)); |