database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge 10.3 into 10.4

Browse Source 
The MDEV-17062 fix in commit c4195305b2
was omitted.
This commit is contained in:
Marko Mäkelä
2020-01-20 15:49:48 +02:00
parent 7ea413ac2d bc43bf3e43
commit 87a61355e8
261 changed files with 3749 additions and 963 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_parse.cc
View File

@ -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 */