mirror of
https://github.com/MariaDB/server.git
synced 2025-02-01 03:21:53 +01:00
Merge a change from mysql-trunk-innodb:
------------------------------------------------------------ revno: 3127 revision-id: vasil.dimov@oracle.com-20100531152341-x2d4hma644icamh1 parent: vasil.dimov@oracle.com-20100531105923-kpjwl4rbgfpfj13c committer: Vasil Dimov <vasil.dimov@oracle.com> branch nick: mysql-trunk-innodb timestamp: Mon 2010-05-31 18:23:41 +0300 message: Fix Bug #53947 InnoDB: Assertion failure in thread 4224 in file .\sync\sync0sync.c line 324 Destroy the rw-lock object before freeing the memory it is occupying. If we do not do this, then the mutex that is contained in the rw-lock object btr_search_latch_temp->mutex gets "freed" and subsequently mutex_free() from sync_close() hits a mutex whose memory has been freed and crashes. Approved by: Heikki (via IRC) Discussed with: Calvin
This commit is contained in:
parent
d02ec3463e
commit
da0b6d611f
1 changed files with 1 additions and 0 deletions
|
@ -182,6 +182,7 @@ void
|
|||
btr_search_sys_free(void)
|
||||
/*=====================*/
|
||||
{
|
||||
rw_lock_free(&btr_search_latch);
|
||||
mem_free(btr_search_latch_temp);
|
||||
btr_search_latch_temp = NULL;
|
||||
mem_heap_free(btr_search_sys->hash_index->heap);
|
||||
|
|
Loading…
Add table
Reference in a new issue