From 3478d656d0b0894d9de16c03096746185be4489e Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 6 Aug 2004 10:22:20 -0700 Subject: join_nested.result, join_nested.test: Added a test case for bug #4922. sql_select.cc: Blocked an optimization performed by join_read_const_table when applied to an inner table of a nested outer join. It was done to fix bug #4922. sql_yacc.yy: Fixed a typo bug in the rule for join_table. sql/sql_yacc.yy: Fixed a typo bug in the rule for join_table. sql/sql_select.cc: Blocked an optimization performed by join_read_const_table when applied to an inner table of a nested outer join. It was done to fix bug #4922. mysql-test/t/join_nested.test: Added a test case for bug #4922. mysql-test/r/join_nested.result: Added a test case for bug #4922. --- sql/sql_yacc.yy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sql/sql_yacc.yy') diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index af6694c6318..f99416cc8c6 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -4593,7 +4593,7 @@ join_table: '(' using_list ')' { add_join_on($3,$7); $$=$3; } - | table_ref LEFT opt_outer JOIN_SYM table_factor ON expr + | table_ref LEFT opt_outer JOIN_SYM table_ref ON expr { add_join_on($5,$7); $5->outer_join|=JOIN_TYPE_LEFT; $$=$5; } | table_ref LEFT opt_outer JOIN_SYM table_factor { @@ -4608,7 +4608,7 @@ join_table: $6->outer_join|=JOIN_TYPE_LEFT; $$=$6; } - | table_ref RIGHT opt_outer JOIN_SYM table_factor ON expr + | table_ref RIGHT opt_outer JOIN_SYM table_ref ON expr { LEX *lex= Lex; if (!($$= lex->current_select->convert_right_join())) -- cgit v1.2.1