revision-id: 24c07973c89244765dc964684c91ce30fc32ac2d (mariadb-10.3.6-7-g24c07973c89) parent(s): 549bcceefd94e8700c9e629bdd2c2f5a73d2459b author: Oleksandr Byelkin committer: Oleksandr Byelkin timestamp: 2018-05-24 10:06:09 +0200 message: fixed all failed tests --- sql/sql_yacc.yy | 1 + sql/sql_yacc_ora.yy | 13 +------------ 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 491874b3b45..d856570c3de 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -13619,6 +13619,7 @@ delete_part2: | HISTORY_SYM delete_single_table opt_delete_system_time { Lex->last_table()->vers_conditions= Lex->vers_conditions; + Lex->pop_select(); //main select } ; diff --git a/sql/sql_yacc_ora.yy b/sql/sql_yacc_ora.yy index 069fa0ae615..9574bcd471c 100644 --- a/sql/sql_yacc_ora.yy +++ b/sql/sql_yacc_ora.yy @@ -3918,12 +3918,7 @@ sp_proc_stmt_return: ; reset_lex_expr: - { - Lex->sphead->reset_lex(thd); - // will be poped in sp_proc_stmt_exit or sp_proc_stmt_continue - if (Lex->main_select_push()) - MYSQL_YYABORT; - } + { Lex->sphead->reset_lex(thd); } expr { $$= $2; } ; @@ -3941,14 +3936,12 @@ sp_proc_stmt_exit: } | EXIT_SYM WHEN_SYM reset_lex_expr { - Lex->pop_select(); //main select pushed in reset_lex_expr if (Lex->sp_exit_statement(thd, $3) || Lex->sphead->restore_lex(thd)) MYSQL_YYABORT; } | EXIT_SYM label_ident WHEN_SYM reset_lex_expr { - Lex->pop_select(); //main select pushed in reset_lex_expr if (Lex->sp_exit_statement(thd, &$2, $4) || Lex->sphead->restore_lex(thd)) MYSQL_YYABORT; @@ -3968,14 +3961,12 @@ sp_proc_stmt_continue: } | CONTINUE_SYM WHEN_SYM reset_lex_expr { - Lex->pop_select(); //main select pushed in reset_lex_expr if (Lex->sp_continue_statement(thd, $3) || Lex->sphead->restore_lex(thd)) MYSQL_YYABORT; } | CONTINUE_SYM label_ident WHEN_SYM reset_lex_expr { - Lex->pop_select(); //main select pushed in reset_lex_expr if (Lex->sp_continue_statement(thd, &$2, $4) || Lex->sphead->restore_lex(thd)) MYSQL_YYABORT; @@ -13541,8 +13532,6 @@ truncate: { LEX* lex= Lex; lex->sql_command= SQLCOM_TRUNCATE; - if (lex->main_select_push()) - MYSQL_YYABORT; lex->alter_info.reset(); lex->builtin_select.options= 0; lex->builtin_select.sql_cache= SELECT_LEX::SQL_CACHE_UNSPECIFIED;