Commit e26eb47b authored by unknown's avatar unknown
Browse files

WL#2486 - natural/using join according to SQL:2003 

Commented out one failing query in the regression test (reported as a bug).


mysql-test/r/join.result:
  Commented out failing query.
mysql-test/t/join.test:
  Commented out failing query.
parent 7c38fc51

mysql-test/r/join.result

+0 −5
Original line number Diff line number Diff line
@@ -464,11 +464,6 @@ select * from t1 natural join (t2 natural join (t3 natural join t4)); 
c	b	a	y

3	1	2	11

3	1	2	2

select * from ((t3 natural left join (t1 natural left join t2)) natural left join t4) natural left join t5;

y	c	b	a	z

11	3	1	2	4

2	3	1	2	NULL

NULL	10	1	2	NULL

select * from t5 natural right join (t4 natural right join ((t2 natural right join t1) natural right join t3));

y	c	b	a	z

11	3	1	2	4

mysql-test/t/join.test

+1 −1
Original line number Diff line number Diff line
@@ -404,7 +404,7 @@ select * from ((t1 natural join t2) natural join t3) natural join t4; 
select * from t1 natural join (t2 natural join (t3 natural join t4));

-- BUG#15355: this query fails in 'prepared statements' mode

-- select * from ((t3 natural join (t1 natural join t2)) natural join t4) natural join t5;

select * from ((t3 natural left join (t1 natural left join t2)) natural left join t4) natural left join t5;

-- select * from ((t3 natural left join (t1 natural left join t2)) natural left join t4) natural left join t5;

select * from t5 natural right join (t4 natural right join ((t2 natural right join t1) natural right join t3));

select * from (t1 natural join t2), (t3 natural join t4);

-- MySQL extension - nested comma ',' operator instead of cross join.