diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-10-06 12:15:32 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-10-06 19:09:27 +0200 |
| commit | 157854f2308b01fce2800f041fbb99b6fb155603 (patch) | |
| tree | 90b559a4ea16f7f42001f7e4b2114c40f36aad2e | |
| parent | 34a1defd3a40c334b340b13b47b3c402ce01177b (diff) | |
| download | mariadb-git-157854f2308b01fce2800f041fbb99b6fb155603.tar.gz | |
wip
| -rw-r--r-- | sql/sql_yacc.yy | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index b0e31310fcb..d44847716e4 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -8420,7 +8420,6 @@ select_paren_derived: Lex->current_select->set_braces(true); } SELECT_SYM select_part2_derived - table_expression { if (setup_select_in_parentheses(Lex)) MYSQL_YYABORT; @@ -10844,7 +10843,6 @@ table_factor: MYSQL_YYABORT; } select_part2_derived - table_expression { LEX *lex= Lex; SELECT_LEX *sel= lex->current_select; @@ -10988,6 +10986,7 @@ select_part2_derived: { Select->parsing_place= NO_MATTER; } + table_expression ; /* handle contents of parentheses in join expression */ @@ -15852,9 +15851,6 @@ query_specification: select_part2_derived { MYSQL_YYABORT_UNLESS(!Lex->current_select->set_braces(0)); - } - table_expression - { $$= Lex->current_select->master_unit()->first_select(); } | '(' select_paren_derived ')' |