From ecb78b4d1027db71f6543142a82a1000593bcfa2 Mon Sep 17 00:00:00 2001
From: "timour@mysql.com" <>
Date: Wed, 30 Nov 2005 19:13:29 +0200
Subject: [PATCH] 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 | 5 -----
 mysql-test/t/join.test   | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/mysql-test/r/join.result b/mysql-test/r/join.result
index e27881a2a30..724d1b1e39f 100644
--- a/mysql-test/r/join.result
+++ b/mysql-test/r/join.result
@@ -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
diff --git a/mysql-test/t/join.test b/mysql-test/t/join.test
index 632b76794de..553aaf987bb 100644
--- a/mysql-test/t/join.test
+++ b/mysql-test/t/join.test
@@ -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.