diff options
| author | unknown <joerg@trift2.> | 2007-02-02 13:57:19 +0100 |
|---|---|---|
| committer | unknown <joerg@trift2.> | 2007-02-02 13:57:19 +0100 |
| commit | 13390debf6aa979ca31437d687eaa9ae2740ad2f (patch) | |
| tree | 326602876bff5943aeb299e34eb514edc40cb14d /sql/sql_yacc.yy | |
| parent | f20a72e11467ec7eddcb93d4f0a928277be9173c (diff) | |
| parent | c01bbd33d79ac5f7ba822a3c8cadb0c31364e366 (diff) | |
| download | mariadb-git-13390debf6aa979ca31437d687eaa9ae2740ad2f.tar.gz | |
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
into trift2.:/MySQL/M51/push-5.1
sql/item_func.cc:
Auto merged
sql/sql_show.cc:
Auto merged
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index eb8641f011f..caca310180d 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -7116,11 +7116,11 @@ join_table: YYERROR_UNLESS($1 && $3); } '(' using_list ')' - { add_join_natural($1,$3,$7); $$=$3; } + { add_join_natural($1,$3,$7,Select); $$=$3; } | table_ref NATURAL JOIN_SYM table_factor { YYERROR_UNLESS($1 && ($$=$4)); - add_join_natural($1,$4,NULL); + add_join_natural($1,$4,NULL,Select); } /* LEFT JOIN variants */ @@ -7147,11 +7147,15 @@ join_table: YYERROR_UNLESS($1 && $5); } USING '(' using_list ')' - { add_join_natural($1,$5,$9); $5->outer_join|=JOIN_TYPE_LEFT; $$=$5; } + { + add_join_natural($1,$5,$9,Select); + $5->outer_join|=JOIN_TYPE_LEFT; + $$=$5; + } | table_ref NATURAL LEFT opt_outer JOIN_SYM table_factor { YYERROR_UNLESS($1 && $6); - add_join_natural($1,$6,NULL); + add_join_natural($1,$6,NULL,Select); $6->outer_join|=JOIN_TYPE_LEFT; $$=$6; } @@ -7185,12 +7189,12 @@ join_table: LEX *lex= Lex; if (!($$= lex->current_select->convert_right_join())) YYABORT; - add_join_natural($$,$5,$9); + add_join_natural($$,$5,$9,Select); } | table_ref NATURAL RIGHT opt_outer JOIN_SYM table_factor { YYERROR_UNLESS($1 && $6); - add_join_natural($6,$1,NULL); + add_join_natural($6,$1,NULL,Select); LEX *lex= Lex; if (!($$= lex->current_select->convert_right_join())) YYABORT; |