database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

10.0-base merge

Browse Source
This commit is contained in:
Sergei Golubchik
2013-01-31 09:48:19 +01:00
parent 055b62f404 5267af5e9e
commit ab83952f29
531 changed files with 47557 additions and 6579 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
storage/perfschema/pfs_instr.cc
View File

@@ -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;
}
/**