bk commit into 5.0 tree (serg:1.1967) BUG#11225

[Sergei Golubchik]

Below is the list of changes that have just been committed into a local
5.0 repository of serg. When serg 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.1967 05/06/10 18:02:19 serg@stripped +1 -0
  bug#11225 - distinct.test fails

  sql/sql_yacc.yy
    1.397 05/06/10 18:01:55 serg@stripped +2 -2
    bug#11225 - distinct.test fails

# 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:	serg
# Host:	serg.mylan
# Root:	/usr/home/serg/Abk/mysql-5.0

--- 1.396/sql/sql_yacc.yy	Thu Jun  9 18:13:13 2005
+++ 1.397/sql/sql_yacc.yy	Fri Jun 10 18:01:55 2005
@@ -5108,11 +5108,11 @@ derived_table_list:
 
 join_table:
         table_ref normal_join table_ref { TEST_ASSERT($1 && ($$=$3)); }
-	| table_ref STRAIGHT_JOIN table_ref
+	| table_ref STRAIGHT_JOIN table_factor
 	  { TEST_ASSERT($1 && ($$=$3)); $3->straight=1; }
 	| table_ref normal_join table_ref ON expr
 	  { TEST_ASSERT($1 && ($$=$3)); add_join_on($3,$5); }
-        | table_ref STRAIGHT_JOIN table_ref ON expr
+        | table_ref STRAIGHT_JOIN table_factor ON expr
           { TEST_ASSERT($1 && ($$=$3)); $3->straight=1; add_join_on($3,$5); }
 	| table_ref normal_join table_ref
 	  USING