diff options
| author | Sunny Bains <Sunny.Bains@Oracle.Com> | 2011-01-26 09:33:59 +1100 |
|---|---|---|
| committer | Sunny Bains <Sunny.Bains@Oracle.Com> | 2011-01-26 09:33:59 +1100 |
| commit | 31790d7f6a1855e93d23495add7a8c873b21629c (patch) | |
| tree | 377511a6ea6c31fdd2b2fdb65e9b8f95ac1cf7cc /storage/innobase/sync | |
| parent | 12a54ac5d76c4d91a82cf1456d9d7a9ebf4fa6c7 (diff) | |
| download | mariadb-git-31790d7f6a1855e93d23495add7a8c873b21629c.tar.gz | |
In sync_close() fix a bug introduced by the fix for Bug #59683 where we iterate
over the mutex list and free each mutex. When UNIV_MEM_DEBUG is defined, we
need skip the hash mutex.
It is a minor bug affecting only UNIV_SYNC_DEBUG builds, found by Michael.
Diffstat (limited to 'storage/innobase/sync')
| -rw-r--r-- | storage/innobase/sync/sync0sync.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/storage/innobase/sync/sync0sync.c b/storage/innobase/sync/sync0sync.c index 13d8ae9ed43..453314f465d 100644 --- a/storage/innobase/sync/sync0sync.c +++ b/storage/innobase/sync/sync0sync.c @@ -1506,7 +1506,7 @@ sync_close(void) for (mutex = UT_LIST_GET_FIRST(mutex_list); mutex != NULL; - mutex = UT_LIST_GET_FIRST(mutex_list)) { + /* No op */) { #ifdef UNIV_MEM_DEBUG if (mutex == &mem_hash_mutex) { @@ -1516,6 +1516,8 @@ sync_close(void) #endif /* UNIV_MEM_DEBUG */ mutex_free(mutex); + + mutex = UT_LIST_GET_FIRST(mutex_list); } mutex_free(&mutex_list_mutex); |