Commit 0b1c6b90 authored by malff/marcsql@weblab.(none)'s avatar malff/marcsql@weblab.(none)
Browse files

Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime 

into  weblab.(none):/home/marcsql/TREE/mysql-5.0-29959
parents 4c208499 e3a82154

sql/sql_yacc.yy

+1 −1
Original line number Diff line number Diff line
@@ -5567,7 +5567,7 @@ join_table: 
          so that [INNER | CROSS] JOIN is properly nested as other

          left-associative joins.

        */

        table_ref %prec TABLE_REF_PRIORITY normal_join table_ref

        table_ref normal_join table_ref %prec TABLE_REF_PRIORITY

          { MYSQL_YYABORT_UNLESS($1 && ($$=$3)); }

	| table_ref STRAIGHT_JOIN table_factor

	  { MYSQL_YYABORT_UNLESS($1 && ($$=$3)); $3->straight=1; }