bk commit into 5.0 tree (timour:1.1912) BUG#6495

[timour]

Below is the list of changes that have just been committed into a local
5.0 repository of timka. When timka does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1912 05/08/23 22:29:05 timour@stripped +2 -0
  Test for BUG#6495.
  
  The bug itself is fixed by WL#2486.

  mysql-test/t/select.test
    1.72 05/08/23 22:29:02 timour@stripped +13 -0
    Test for BUG#6495.

  mysql-test/r/select.result
    1.87 05/08/23 22:29:02 timour@stripped +12 -0
    Test for BUG#6495.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	timour
# Host:	lamia.home
# Root:	/home/timka/mysql/src/5.0-2486

--- 1.86/mysql-test/r/select.result	2005-08-23 20:24:26 +03:00
+++ 1.87/mysql-test/r/select.result	2005-08-23 22:29:02 +03:00
@@ -2875,3 +2875,15 @@
 1	1	1	1
 1	2	2	1
 drop table t1, t2, t3;
+create table t1 (a char(1));
+create table t2 (a char(1));
+insert into t1 values ('a'),('b'),('c');
+insert into t2 values ('b'),('c'),('d');
+select a from t1 natural join t2;
+a
+b
+c
+select * from t1 natural join t2 where a = 'b';
+a
+b
+drop table t1, t2;

--- 1.71/mysql-test/t/select.test	2005-08-23 20:24:26 +03:00
+++ 1.72/mysql-test/t/select.test	2005-08-23 22:29:02 +03:00
@@ -2443,3 +2443,16 @@
 select * from t1 natural join t2 natural join t3;
 select * from t1 natural join t3 natural join t2;
 drop table t1, t2, t3;
+
+
+#
+# Bug #6495 Illogical requirement for column qualification in NATURAL join
+#
+
+create table t1 (a char(1));
+create table t2 (a char(1));
+insert into t1 values ('a'),('b'),('c');
+insert into t2 values ('b'),('c'),('d');
+select a from t1 natural join t2;
+select * from t1 natural join t2 where a = 'b';
+drop table t1, t2;