From 039a01a1ebfbdb4c51fdb01fdbc67aa0de6e11f9 Mon Sep 17 00:00:00 2001
From: unknown <serg@serg.mylan>
Date: Fri, 10 Jun 2005 18:02:19 +0200
Subject: bug#11225 - distinct.test fails

---
 sql/sql_yacc.yy | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'sql')

diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index 33d6c192d07..892d2516808 100644
--- 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
-- 
cgit v1.2.1