diff options
| author | unknown <igor@rurik.mysql.com> | 2004-08-06 10:22:20 -0700 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2004-08-06 10:22:20 -0700 |
| commit | 3478d656d0b0894d9de16c03096746185be4489e (patch) | |
| tree | 2ebf29b003c8dccb44d4fc2876cb34702cc0d6c1 /sql/sql_yacc.yy | |
| parent | 8a33c2bc8fb816c93baddaa04835d8dc5d7fde35 (diff) | |
| download | mariadb-git-3478d656d0b0894d9de16c03096746185be4489e.tar.gz | |
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.
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 4 |
1 files changed, 2 insertions, 2 deletions
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())) |