diff options
| author | unknown <igor@rurik.mysql.com> | 2004-08-06 10:31:45 -0700 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2004-08-06 10:31:45 -0700 |
| commit | 578b0f57de5946a5909dcb1572864fe454ed677e (patch) | |
| tree | 96ece2dfdcfa9f130b76d317e7b593a9f75f0b73 /sql/sql_yacc.yy | |
| parent | 98f85188cc4319db20787efe881e927b9eb2c201 (diff) | |
| parent | 3478d656d0b0894d9de16c03096746185be4489e (diff) | |
| download | mariadb-git-578b0f57de5946a5909dcb1572864fe454ed677e.tar.gz | |
Merge rurik.mysql.com:/home/igor/mysql-5.0
into rurik.mysql.com:/home/igor/dev/mysql-5.0-1
sql/sql_select.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
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 cdce36ac2d0..751125c9fe8 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -4589,7 +4589,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 { @@ -4604,7 +4604,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())) |