bk commit into 5.0 tree (timour:1.1901) BUG#10646

[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.1901 05/08/22 17:34:08 timour@stripped +2 -0
  Test case for BUG#10646
  
  The bug itself is fixed by WL #2486.

  mysql-test/t/select.test
    1.67 05/08/22 17:34:05 timour@stripped +10 -0
    Test for BUG#10646

  mysql-test/r/select.result
    1.82 05/08/22 17:34:05 timour@stripped +5 -0
    Test for BUG#10646

# 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-dbg

--- 1.81/mysql-test/r/select.result	2005-08-22 17:04:52 +03:00
+++ 1.82/mysql-test/r/select.result	2005-08-22 17:34:05 +03:00
@@ -2775,3 +2775,8 @@
 1	bob	1
 drop table t1,t2;
 drop view v1;
+create table t1 (pk int primary key, b int);
+create table t2 (pk int primary key, c int);
+select pk from t1 inner join t2 using (pk);
+pk
+drop table t1,t2;

--- 1.66/mysql-test/t/select.test	2005-08-22 17:04:52 +03:00
+++ 1.67/mysql-test/t/select.test	2005-08-22 17:34:05 +03:00
@@ -2371,3 +2371,13 @@
 select * from v1;
 drop table t1,t2;
 drop view v1;
+
+#
+# Bug #10646 Columns included in the join between two tables are ambigious
+# in the select
+#
+
+create table t1 (pk int primary key, b int);
+create table t2 (pk int primary key, c int);
+select pk from t1 inner join t2 using (pk);
+drop table t1,t2;