From 6c937d71530fd83c434a1e5f8dbef53a3dbd6c45 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 19 Mar 2004 12:36:55 +0400 Subject: Fix for the bug #2976: NATURAL JOIN produces duplicate columns. Improvement natural join code in the setup_conds(). mysql-test/r/join.result: Fix for the bug #2976: NATURAL JOIN produces duplicate columns mysql-test/r/join_outer.result: Fix for the bug #2976: NATURAL JOIN produces duplicate columns mysql-test/r/select.result: Fix for the bug #2976: NATURAL JOIN produces duplicate columns --- mysql-test/r/join.result | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'mysql-test/r/join.result') diff --git a/mysql-test/r/join.result b/mysql-test/r/join.result index 7dbc09f9cc0..f9e49c40dc1 100644 --- a/mysql-test/r/join.result +++ b/mysql-test/r/join.result @@ -277,11 +277,11 @@ CREATE TABLE t2 (ID INTEGER NOT NULL PRIMARY KEY, Value2 VARCHAR(255)); INSERT INTO t1 VALUES (1, 'A'); INSERT INTO t2 VALUES (1, 'B'); SELECT * FROM t1 NATURAL JOIN t2 WHERE 1 AND (Value1 = 'A' AND Value2 <> 'B'); -ID Value1 ID Value2 +ID Value1 Value2 SELECT * FROM t1 NATURAL JOIN t2 WHERE 1 AND Value1 = 'A' AND Value2 <> 'B'; -ID Value1 ID Value2 +ID Value1 Value2 SELECT * FROM t1 NATURAL JOIN t2 WHERE (Value1 = 'A' AND Value2 <> 'B') AND 1; -ID Value1 ID Value2 +ID Value1 Value2 drop table t1,t2; create table t1 (i int); create table t2 (i int); -- cgit v1.2.1