diff options
| author | Alexander Barkov <bar@mariadb.org> | 2017-08-15 07:52:48 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2017-08-15 07:52:48 +0400 |
| commit | 6db1b0188cbf91bda633150c04520bfa7d733eb8 (patch) | |
| tree | a2e6fe222b53630824a24c471e7f490f3072641d /sql/sql_yacc.yy | |
| parent | 3e7b1bd64a35cbb939502a685af274d666d90a16 (diff) | |
| parent | 9822fb1f19242d0420e4a3a05fb9349d6a80e1ec (diff) | |
| download | mariadb-git-6db1b0188cbf91bda633150c04520bfa7d733eb8.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 | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 69a6931ece8..e3a52696fcd 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -10084,8 +10084,7 @@ function_call_conflict: } | REPLACE '(' expr ',' expr ',' expr ')' { - $$= new (thd->mem_root) Item_func_replace(thd, $3, $5, $7); - if ($$ == NULL) + if (!($$= Lex->make_item_func_replace(thd, $3, $5, $7))) MYSQL_YYABORT; } | REVERSE_SYM '(' expr ')' |