diff options
| author | Michael Widenius <monty@askmonty.org> | 2013-06-19 22:57:46 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2013-06-19 22:57:46 +0300 |
| commit | f62f4bd563a96ddd78b78d563e4d4cf5ad27aae1 (patch) | |
| tree | 17d34be40ccafdbb0ffee956c87aa86bf3aef3fc /storage/perfschema | |
| parent | dfcc502ab540b4d93fe3d40d0bac15fa3ae449dd (diff) | |
| download | mariadb-git-f62f4bd563a96ddd78b78d563e4d4cf5ad27aae1.tar.gz | |
Fixed some memory leaks
Disabled some asserts that we can't yet have enabled
Diffstat (limited to 'storage/perfschema')
| -rw-r--r-- | storage/perfschema/pfs_instr.cc | 2 | ||||
| -rw-r--r-- | storage/perfschema/pfs_setup_object.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/storage/perfschema/pfs_instr.cc b/storage/perfschema/pfs_instr.cc index 68ec8b149a3..dd8f21a262c 100644 --- a/storage/perfschema/pfs_instr.cc +++ b/storage/perfschema/pfs_instr.cc @@ -797,7 +797,7 @@ PFS_cond* create_cond(PFS_cond_class *klass, const void *identity) */ void destroy_cond(PFS_cond *pfs) { - DBUG_ENTER("destroy_thread"); + DBUG_ENTER("destroy_cond"); DBUG_ASSERT(pfs != NULL); PFS_cond_class *klass= pfs->m_class; diff --git a/storage/perfschema/pfs_setup_object.cc b/storage/perfschema/pfs_setup_object.cc index 0ca7986e818..eaded47f60b 100644 --- a/storage/perfschema/pfs_setup_object.cc +++ b/storage/perfschema/pfs_setup_object.cc @@ -110,8 +110,8 @@ void cleanup_setup_object_hash(void) { if (setup_object_hash_inited) { - lf_hash_destroy(&setup_object_hash); setup_object_hash_inited= false; + lf_hash_destroy(&setup_object_hash); } } |