summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mariadb.org>2017-08-15 09:55:09 +0400
committerAlexander Barkov <bar@mariadb.org>2017-08-15 09:55:09 +0400
commit22c9663d8563b4f825f28db978661e60ec618db5 (patch)
treefcff9f891aed8d2abfd1bc43596f974e69aa66ae /sql
parent6179a8efdc9d3fb6474f62cf2f65a733b2648d6a (diff)
downloadmariadb-git-22c9663d8563b4f825f28db978661e60ec618db5.tar.gz
MDEV-13527 Crash when EXPLAIN SELECT .. INTO row_sp_variable.field
Diffstat (limited to 'sql')
-rw-r--r--sql/sql_yacc.yy2
-rw-r--r--sql/sql_yacc_ora.yy2
2 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index 49eda48c451..56b434229e2 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -12155,7 +12155,7 @@ select_outvar:
}
| ident '.' ident
{
- if (!($$= Lex->create_outvar(thd, &$1, &$3)))
+ if (!($$= Lex->create_outvar(thd, &$1, &$3)) && Lex->result)
MYSQL_YYABORT;
}
;
diff --git a/sql/sql_yacc_ora.yy b/sql/sql_yacc_ora.yy
index 80c9375e777..660212dd4b0 100644
--- a/sql/sql_yacc_ora.yy
+++ b/sql/sql_yacc_ora.yy
@@ -12218,7 +12218,7 @@ select_outvar:
}
| ident '.' ident
{
- if (!($$= Lex->create_outvar(thd, &$1, &$3)))
+ if (!($$= Lex->create_outvar(thd, &$1, &$3)) && Lex->result)
MYSQL_YYABORT;
}
;