diff options
| author | Alexander Barkov <bar@mariadb.org> | 2017-08-15 09:59:17 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2017-08-15 09:59:17 +0400 |
| commit | 1743883d55747b0157aae94f595bd21abbc65ea9 (patch) | |
| tree | 3d0294f221f5ae7000d83e4ca3bf2083658ad443 /sql/sql_yacc.yy | |
| parent | 6db1b0188cbf91bda633150c04520bfa7d733eb8 (diff) | |
| parent | 22c9663d8563b4f825f28db978661e60ec618db5 (diff) | |
| download | mariadb-git-1743883d55747b0157aae94f595bd21abbc65ea9.tar.gz | |
Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index e3a52696fcd..377be90056c 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -12156,7 +12156,7 @@ select_outvar: } | ident '.' ident { - if (!($$= Lex->create_outvar(thd, &$1, &$3))) + if (!($$= Lex->create_outvar(thd, &$1, &$3)) && Lex->result) MYSQL_YYABORT; } ; |