List:Commits« Previous MessageNext Message »
From:Sunny Bains Date:January 25 2011 10:54pm
Subject:bzr push into mysql-5.5-innodb branch (Sunny.Bains:3291 to 3292) Bug#59683
View as plain text  
 3292 Sunny Bains	2011-01-26
      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.

    modified:
      storage/innobase/sync/sync0sync.c
 3291 Marko Mäkelä	2011-01-25 [merge]
      Merge mysql-5.1-innodb to mysql-5.5-innodb.

    modified:
      storage/innobase/mtr/mtr0log.c
      storage/innobase/row/row0vers.c
=== modified file 'storage/innobase/sync/sync0sync.c'
--- a/storage/innobase/sync/sync0sync.c	revid:marko.makela@stripped103535-yrom0ik8nvn80edz
+++ b/storage/innobase/sync/sync0sync.c	revid:sunny.bains@strippedyoox0rm931
@@ -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);

Attachment: [text/bzr-bundle] bzr/sunny.bains@oracle.com-20110125223359-bc6tfhyoox0rm931.bundle
Thread
bzr push into mysql-5.5-innodb branch (Sunny.Bains:3291 to 3292) Bug#59683Sunny Bains25 Jan