Commit 48838170 authored by unknown's avatar unknown

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
parents f3ad7320 a671075d
...@@ -667,15 +667,15 @@ b varchar(10), ...@@ -667,15 +667,15 @@ b varchar(10),
index (a,b) index (a,b)
) engine=myisam; ) engine=myisam;
insert into t2 values ( null, ''); insert into t2 values ( null, '');
insert into t2 values ( 9999999999.9999, ''); insert into t2 values ( 9999999999.999, '');
insert into t3 select * from t2; insert into t3 select * from t2;
select min(a), max(a) from t1; select min(a), max(a) from t1;
min(a) max(a) min(a) max(a)
9999999999.9999 9999999999.9999 9999999999.9990 9999999999.9990
flush tables; flush tables;
select min(a), max(a) from t1; select min(a), max(a) from t1;
min(a) max(a) min(a) max(a)
9999999999.9999 9999999999.9999 9999999999.9990 9999999999.9990
drop table t1, t2, t3; drop table t1, t2, t3;
create table t1 (a int,b int,c int, index (a,b,c)); 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)); create table t2 (a int,b int,c int, index (a,b,c));
......
...@@ -312,7 +312,7 @@ create table t3 ( ...@@ -312,7 +312,7 @@ create table t3 (
) engine=myisam; ) engine=myisam;
insert into t2 values ( null, ''); insert into t2 values ( null, '');
insert into t2 values ( 9999999999.9999, ''); insert into t2 values ( 9999999999.999, '');
insert into t3 select * from t2; insert into t3 select * from t2;
select min(a), max(a) from t1; select min(a), max(a) from t1;
flush tables; flush tables;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment