bk commit into 5.0 tree (acurtis:1.1961) BUG#10586

[antony]

Below is the list of changes that have just been committed into a local
5.0 repository of antony. When antony 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.1961 05/09/08 18:15:05 acurtis@stripped +2 -0
  Bug#10586
    regression test

  mysql-test/t/derived.test
    1.51 05/09/08 18:14:36 acurtis@stripped +13 -0
    Test for bug

  mysql-test/r/derived.result
    1.56 05/09/08 18:14:36 acurtis@stripped +12 -0
    Test for bug

# 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:	acurtis
# Host:	ltantony.xiphis.org
# Root:	/usr/home/antony/work2/p2-bug10586.5

--- 1.55/mysql-test/r/derived.result	2005-08-15 10:21:53 +01:00
+++ 1.56/mysql-test/r/derived.result	2005-09-08 18:14:36 +01:00
@@ -368,3 +368,15 @@
 select * from (select * from t1,t2) foo;
 ERROR 42S21: Duplicate column name 'a'
 drop table t1,t2;
+create table t1 (ID int unsigned not null auto_increment,
+DATA varchar(5) not null, primary key (ID));
+create table t2 (ID int unsigned not null auto_increment,
+DATA varchar(5) not null, FID int unsigned not null,
+primary key (ID));
+select A.* from (t1 inner join (select * from t2) as A on t1.ID = A.FID);
+ID	DATA	FID
+select t2.* from ((select * from t1) as A inner join t2 on A.ID = t2.FID);
+ID	DATA	FID
+select t2.* from (select * from t1) as A inner join t2 on A.ID = t2.FID;
+ID	DATA	FID
+drop table t1, t2;

--- 1.50/mysql-test/t/derived.test	2005-08-10 14:36:09 +01:00
+++ 1.51/mysql-test/t/derived.test	2005-09-08 18:14:36 +01:00
@@ -258,4 +258,17 @@
 select * from (select * from t1,t2) foo;
 drop table t1,t2;
 
+#
+# Bug#10586 - query works with 4.1.8, but not with 4.1.11
+#
+create table t1 (ID int unsigned not null auto_increment,
+                 DATA varchar(5) not null, primary key (ID));
+create table t2 (ID int unsigned not null auto_increment,
+                 DATA varchar(5) not null, FID int unsigned not null,
+                 primary key (ID));
+select A.* from (t1 inner join (select * from t2) as A on t1.ID = A.FID);
+select t2.* from ((select * from t1) as A inner join t2 on A.ID = t2.FID);
+select t2.* from (select * from t1) as A inner join t2 on A.ID = t2.FID;
+drop table t1, t2;
+
 # End of 4.1 tests