diff options
| author | Sergei Petrunia <psergey@askmonty.org> | 2020-01-17 00:24:17 +0300 |
|---|---|---|
| committer | Sergei Petrunia <psergey@askmonty.org> | 2020-01-17 00:24:17 +0300 |
| commit | b04429434ad1ee7f49d263762a560f4ff31dd111 (patch) | |
| tree | b4018c1ddc398c4baa5d98edafd41eaee7dd88e3 /sql/sql_trigger.cc | |
| parent | bb8226deabd177d70151d5e0729bf08533954ffd (diff) | |
| parent | bde7e0ba6e94d576c4563022f38e8d81b1f6d54a (diff) | |
| download | mariadb-git-b04429434ad1ee7f49d263762a560f4ff31dd111.tar.gz | |
Merge branch '10.1' into 10.2
# Conflicts:
# sql/sp_head.cc
# sql/sql_select.cc
# sql/sql_trigger.cc
Diffstat (limited to 'sql/sql_trigger.cc')
| -rw-r--r-- | sql/sql_trigger.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_trigger.cc b/sql/sql_trigger.cc index daea60c26bc..2d1c3e1cafb 100644 --- a/sql/sql_trigger.cc +++ b/sql/sql_trigger.cc @@ -337,7 +337,7 @@ public: Trigger::~Trigger() { - delete body; + sp_head::destroy(body); } |