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

Merge branch '10.1' into 10.2

# Conflicts:
#	sql/sp_head.cc
#	sql/sql_select.cc
#	sql/sql_trigger.cc
This commit is contained in:
Sergei Petrunia
2020-01-17 00:24:17 +03:00
14 changed files with 67 additions and 67 deletions

View File

@ -337,7 +337,7 @@ public:
Trigger::~Trigger()
{
delete body;
sp_head::destroy(body);
}