bk commit into 5.0 tree (gkodinov:1.2188) BUG#18080

[kgeorge]

Below is the list of changes that have just been committed into a local
5.0 repository of kgeorge. When kgeorge 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.2188 06/06/21 13:03:06 gkodinov@stripped +2 -0
  merge of the changes for bug #18080

  mysql-test/r/insert_select.result
    1.38 06/06/21 13:03:01 gkodinov@stripped +4 -4
    manual merge

  mysql-test/t/insert_select.test
    1.31 06/06/21 12:54:14 gkodinov@stripped +0 -0
    Auto merged

# 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:	gkodinov
# Host:	rakia.(none)
# Root:	/home/kgeorge/mysql/5.0/B18080/RESYNC

--- 1.37/mysql-test/r/insert_select.result	2006-06-21 00:17:42 +03:00
+++ 1.38/mysql-test/r/insert_select.result	2006-06-21 13:03:01 +03:00
@@ -690,3 +690,8 @@
 INSERT INTO t1 values (1), (2);
 INSERT INTO t1 SELECT a + 2 FROM t1 LIMIT 1;
 DROP TABLE t1;
+CREATE TABLE t1 (x int, y int);
+CREATE TABLE t2 (z int, y int);
+CREATE TABLE t3 (a int, b int);
+INSERT INTO t3 (SELECT x, y FROM t1 JOIN t2 USING (y) WHERE z = 1);
+DROP TABLE IF EXISTS t1,t2,t3;

--- 1.30/mysql-test/t/insert_select.test	2006-06-21 00:17:42 +03:00
+++ 1.31/mysql-test/t/insert_select.test	2006-06-21 12:54:14 +03:00
@@ -238,3 +238,12 @@
 DROP TABLE t1;
 
 # End of 4.1 tests
+
+#
+# Bug #18080: INSERT ... SELECT ... JOIN results in ambiguous field list error
+#
+CREATE TABLE t1 (x int, y int);
+CREATE TABLE t2 (z int, y int);
+CREATE TABLE t3 (a int, b int);
+INSERT INTO t3 (SELECT x, y FROM t1 JOIN t2 USING (y) WHERE z = 1);
+DROP TABLE IF EXISTS t1,t2,t3;