diff options
author | Sergei Golubchik <sergii@pisem.net> | 2013-01-31 09:48:19 +0100 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2013-01-31 09:48:19 +0100 |
commit | ab83952f293ea46c00e421c81b81a394c9cae2b4 (patch) | |
tree | 6a3e995bd1330828a0e988d896bca218863fc74c /storage/perfschema/pfs_instr.cc | |
parent | 055b62f404ee0a0463ee8ff98a0e24c083b95f1d (diff) | |
parent | 5267af5e9e5e601d4f4b1ef40730da1e36d38d9d (diff) | |
download | mariadb-git-ab83952f293ea46c00e421c81b81a394c9cae2b4.tar.gz |
10.0-base merge
Diffstat (limited to 'storage/perfschema/pfs_instr.cc')
-rw-r--r-- | storage/perfschema/pfs_instr.cc | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/storage/perfschema/pfs_instr.cc b/storage/perfschema/pfs_instr.cc index 44d424e9df6..39caabaf030 100644 --- a/storage/perfschema/pfs_instr.cc +++ b/storage/perfschema/pfs_instr.cc @@ -998,8 +998,6 @@ PFS_socket *sanitize_socket(PFS_socket *unsafe) */ void destroy_thread(PFS_thread *pfs) { - DBUG_ENTER("destroy_thread"); - DBUG_ASSERT(pfs != NULL); if (pfs->m_account != NULL) { @@ -1062,7 +1060,6 @@ void destroy_thread(PFS_thread *pfs) pfs->m_digest_hash_pins= NULL; } pfs->m_lock.allocated_to_free(); - DBUG_VOID_RETURN; } /** |