summaryrefslogtreecommitdiff
path: root/mysql-test/r/join_outer.result
diff options
context:
space:
mode:
authorunknown <ram@gw.mysql.r18.ru>2004-03-19 12:36:55 +0400
committerunknown <ram@gw.mysql.r18.ru>2004-03-19 12:36:55 +0400
commit6c937d71530fd83c434a1e5f8dbef53a3dbd6c45 (patch)
treeaeea70f904a6438cab4d823064329643ef78654b /mysql-test/r/join_outer.result
parentbf4e1d4681554a9c8369ebce6c33fecac197f0e7 (diff)
downloadmariadb-git-6c937d71530fd83c434a1e5f8dbef53a3dbd6c45.tar.gz
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
Diffstat (limited to 'mysql-test/r/join_outer.result')
-rw-r--r--mysql-test/r/join_outer.result12
1 files changed, 6 insertions, 6 deletions
diff --git a/mysql-test/r/join_outer.result b/mysql-test/r/join_outer.result
index c40f86827f8..9d7c3d98952 100644
--- a/mysql-test/r/join_outer.result
+++ b/mysql-test/r/join_outer.result
@@ -124,8 +124,8 @@ grp a c id a c d
3 5 C 3 5 B 5
3 6 D 3 6 C 6
select t1.*,t2.* from t1 natural join t2;
-grp a c id a c d
-1 1 a 1 1 a 1
+grp a c id d
+1 1 a 1 1
drop table t1,t2;
CREATE TABLE t1 (
usr_id INT unsigned NOT NULL,
@@ -467,10 +467,10 @@ count color
15 white
7 green
select * from t2 natural join t1;
-count color color name
-10 green green lime
-7 green green lime
-5 black black grape
+count color name
+10 green lime
+7 green lime
+5 black grape
select t2.count, t1.name from t2 natural join t1;
count name
10 lime