Merge bk-internal:/home/bk/mysql-5.0

into  mysql.com:/home/jimw/my/mysql-5.0-clean
This commit is contained in:
jimw@mysql.com 2005-11-18 05:24:29 -08:00
commit 385082ede0
2 changed files with 15 additions and 2 deletions

View file

@ -204,6 +204,21 @@ create table t1 (a int);
insert into t1 values (1), (2), (3); insert into t1 values (1), (2), (3);
create view v1 (a) as select a+1 from t1; create view v1 (a) as select a+1 from t1;
create view v2 (a) as select a-1 from t1; create view v2 (a) as select a-1 from t1;
select * from t1 natural left join v1;
a
1
2
3
select * from v2 natural left join t1;
a
0
1
2
select * from v2 natural left join v1;
a
0
1
2
drop view v1, v2; drop view v1, v2;
drop table t1; drop table t1;
create table t1 (a int); create table t1 (a int);

View file

@ -147,11 +147,9 @@ insert into t1 values (1), (2), (3);
create view v1 (a) as select a+1 from t1; create view v1 (a) as select a+1 from t1;
create view v2 (a) as select a-1 from t1; create view v2 (a) as select a-1 from t1;
--disable_parsing # WL #2486 should enable these tests
select * from t1 natural left join v1; select * from t1 natural left join v1;
select * from v2 natural left join t1; select * from v2 natural left join t1;
select * from v2 natural left join v1; select * from v2 natural left join v1;
--enable_parsing
drop view v1, v2; drop view v1, v2;
drop table t1; drop table t1;