diff options
| author | unknown <bell@sanja.is.com.ua> | 2004-11-21 20:08:12 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2004-11-21 20:08:12 +0200 |
| commit | 5a00a868b74ffb6b220eb72c87ec38696ce9406c (patch) | |
| tree | 76a673d7a9b20f184988993cc14ce455b1d73f70 /sql/sql_yacc.yy | |
| parent | 436c7714dd6df991f2e968b313906d4b1e70db97 (diff) | |
| parent | c9497e2365461fb2547a8cfceb33b68a99d7fe0b (diff) | |
| download | mariadb-git-5a00a868b74ffb6b220eb72c87ec38696ce9406c.tar.gz | |
merge
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/opt_sum.cc:
Auto merged
sql/sp.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_help.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_view.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 14086514ff7..d2f02acb75b 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -4836,11 +4836,11 @@ when_list2: table_ref: table_factor { $$=$1; } | join_table { $$=$1; } - { + { LEX *lex= Lex; if (!($$= lex->current_select->nest_last_join(lex->thd))) YYABORT; - } + } ; join_table_list: @@ -4930,20 +4930,20 @@ table_factor: sel->get_use_index(), sel->get_ignore_index()))) YYABORT; - sel->add_joined_table($$); + sel->add_joined_table($$); } | '(' - { + { LEX *lex= Lex; if (lex->current_select->init_nested_join(lex->thd)) YYABORT; - } + } join_table_list ')' { LEX *lex= Lex; if (!($$= lex->current_select->end_nested_join(lex->thd))) YYABORT; - } + } | '{' ident table_ref LEFT OUTER JOIN_SYM table_ref ON expr '}' { add_join_on($7,$9); $7->outer_join|=JOIN_TYPE_LEFT; $$=$7; } | '(' SELECT_SYM select_derived ')' opt_table_alias |