bk commit into 5.0 tree (timour:1.1969) BUG#12943

[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.1969 05/09/12 19:18:17 timour@stripped +2 -0
  BUG#12943 - post-merge fix

  mysql-test/t/select.test
    1.77 05/09/12 19:18:14 timour@stripped +3 -0
    post-merge fix

  mysql-test/r/select.result
    1.92 05/09/12 19:18:14 timour@stripped +1 -0
    post-merge fix

# 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-bug-12943

--- 1.91/mysql-test/r/select.result	2005-09-12 19:05:53 +03:00
+++ 1.92/mysql-test/r/select.result	2005-09-12 19:18:14 +03:00
@@ -2922,6 +2922,7 @@
 select * from t1 inner join t2 using (a);
 a	b	b
 1	10	10
+drop table t1, t2;
 create table t1 (a int, c int);
 create table t2 (b int);
 create table t3 (b int, a int);

--- 1.76/mysql-test/t/select.test	2005-09-12 19:05:53 +03:00
+++ 1.77/mysql-test/t/select.test	2005-09-12 19:18:14 +03:00
@@ -2499,6 +2499,9 @@
 # both queries should produce the same result
 select * from t1 inner join t2 using (A);
 select * from t1 inner join t2 using (a);
+drop table t1, t2;
+
+#
 # Bug #12943 Incorrect nesting of [INNER| CROSS] JOIN due to unspecified
 #            associativity in the parser.
 #