diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-01-20 15:49:48 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-01-20 15:49:48 +0200 |
| commit | 87a61355e8e499baf7908862711c26aa0225bf32 (patch) | |
| tree | 7122052c801b5f1ee4a93af2348fad916aa2f86b /sql/sql_parse.cc | |
| parent | 7ea413ac2d80c7f03d1dbad90ac30ecddd8b2835 (diff) | |
| parent | bc43bf3e430c20bc2178e584215bd443054709d6 (diff) | |
| download | mariadb-git-87a61355e8e499baf7908862711c26aa0225bf32.tar.gz | |
Merge 10.3 into 10.4
The MDEV-17062 fix in commit c4195305b2a8431f39a4c75cc1c66ba43685f7a0
was omitted.
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index d89cae39330..2c74f15aa17 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -5176,7 +5176,7 @@ mysql_execute_command(THD *thd) /* Don't do it, if we are inside a SP */ if (!thd->spcont) { - delete lex->sphead; + sp_head::destroy(lex->sphead); lex->sphead= NULL; } /* lex->unit.cleanup() is called outside, no need to call it here */ |