bug#11225 - distinct.test fails

6f45ac2c · serg@serg.mylan · e1870b75 · 6f45ac2c
Commit 6f45ac2c authored Jun 10, 2005 by serg@serg.mylan
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

sql/sql_yacc.yy sql/sql_yacc.yy +2 -2

No files found.
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -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