summaryrefslogtreecommitdiff
path: root/sql/sql_yacc_ora.yy
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mariadb.com>2019-05-21 14:22:49 +0400
committerAlexander Barkov <bar@mariadb.com>2019-05-21 14:22:49 +0400
commit8164bd24a611ee2682ff0ba922fd0da526f75f14 (patch)
treecfe7ae117353778c867729e16323fb564dbe81c3 /sql/sql_yacc_ora.yy
parented39181a27ed95e1de63661bdeb6cfc21c3c6c03 (diff)
downloadmariadb-git-8164bd24a611ee2682ff0ba922fd0da526f75f14.tar.gz
MDEV-19535 sql_mode=ORACLE: 'SELECT INTO @var FOR UPDATE' does not lock the table
Diffstat (limited to 'sql/sql_yacc_ora.yy')
-rw-r--r--sql/sql_yacc_ora.yy4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_yacc_ora.yy b/sql/sql_yacc_ora.yy
index 1537adaaaf3..89538884d2b 100644
--- a/sql/sql_yacc_ora.yy
+++ b/sql/sql_yacc_ora.yy
@@ -9239,7 +9239,7 @@ select:
opt_procedure_or_into
{
Lex->pop_select();
- if (Lex->select_finalize($1))
+ if (Lex->select_finalize($1, $3))
MYSQL_YYABORT;
}
| with_clause query_expression_body
@@ -9254,7 +9254,7 @@ select:
Lex->pop_select();
$2->set_with_clause($1);
$1->attach_to($2->first_select());
- if (Lex->select_finalize($2))
+ if (Lex->select_finalize($2, $4))
MYSQL_YYABORT;
}
;