diff options
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 fab8f19950f..ed2243c4b77 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -4840,11 +4840,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: @@ -4934,20 +4934,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 |