1 files changed, 4 insertions, 0 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index dfbc89e411a..d506eb489b3 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -13298,6 +13298,8 @@ delete_part2:
           {
             Lex->last_table()->vers_conditions= Lex->vers_conditions;
             Lex->pop_select(); //main select
+            if (Lex->check_main_unit_semantics())
+              MYSQL_YYABORT;
           }
         ;
 
@@ -13334,6 +13336,8 @@ single_multi:
             if ($3)
               Select->order_list= *($3);
             Lex->pop_select(); //main select
+            if (Lex->check_main_unit_semantics())
+              MYSQL_YYABORT;
           }
         | table_wild_list
           {