diff options
| author | Sergei Petrunia <psergey@askmonty.org> | 2020-01-17 00:46:40 +0300 |
|---|---|---|
| committer | Sergei Petrunia <psergey@askmonty.org> | 2020-01-17 00:46:40 +0300 |
| commit | e709eb9bf712006d070767629518f827cd2f6bed (patch) | |
| tree | 103290899cbe2a67f78277e0e33486e51ef01717 /sql/sp_head.cc | |
| parent | d531b4ee3a9bcd89a2fa6b49a2207eaf966f53e3 (diff) | |
| parent | b04429434ad1ee7f49d263762a560f4ff31dd111 (diff) | |
| download | mariadb-git-e709eb9bf712006d070767629518f827cd2f6bed.tar.gz | |
Merge branch '10.2' into 10.3
# Conflicts:
# mysql-test/suite/galera/r/MW-388.result
# mysql-test/suite/galera/t/MW-388.test
# mysql-test/suite/innodb/r/truncate_inject.result
# mysql-test/suite/innodb/t/truncate_inject.test
# mysql-test/suite/rpl/r/rpl_stop_slave.result
# mysql-test/suite/rpl/t/rpl_stop_slave.test
# sql/sp_head.cc
# sql/sp_head.h
# sql/sql_lex.cc
# sql/sql_yacc.yy
# storage/xtradb/buf/buf0dblwr.cc
Diffstat (limited to 'sql/sp_head.cc')
| -rw-r--r-- | sql/sp_head.cc | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/sql/sp_head.cc b/sql/sp_head.cc index af4316085b7..3a113de9dd5 100644 --- a/sql/sp_head.cc +++ b/sql/sp_head.cc @@ -473,7 +473,7 @@ check_routine_name(const LEX_CSTRING *ident) * sp_head * */ - + sp_head *sp_head::create(sp_package *parent, const Sp_handler *handler) { MEM_ROOT own_root; @@ -493,14 +493,20 @@ void sp_head::destroy(sp_head *sp) { /* Make a copy of main_mem_root as free_root will free the sp */ MEM_ROOT own_root= sp->main_mem_root; - delete sp; - DBUG_PRINT("info", ("mem_root 0x%lx moved to 0x%lx", (ulong) &sp->mem_root, (ulong) &own_root)); + delete sp; + + free_root(&own_root, MYF(0)); } } +/* + * + * sp_head + * + */ sp_head::sp_head(MEM_ROOT *mem_root_arg, sp_package *parent, const Sp_handler *sph) |