List:Commits« Previous MessageNext Message »
From:Sunny Bains Date:January 25 2011 10:53pm
Subject:bzr push into mysql-trunk-innodb branch (Sunny.Bains:3459 to 3460)
View as plain text  
 3460 Sunny Bains	2011-01-26 [merge]
      Merge from mysql-5.5-innodb to mysql-trunk-innodb.

    modified:
      storage/innobase/sync/sync0sync.c
 3459 Marko Mäkelä	2011-01-25
      Add some debug assertions to unlocking.
      
      lock_rec_unlock(): Assert that the transaction is active
      and has no waiting lock.
      
      lock_unlock_table_autoinc(): Assert that the transaction has not been started
      or it is active. Assert that it has no waiting lock.

    modified:
      storage/innobase/lock/lock0lock.c
=== modified file 'storage/innobase/sync/sync0sync.c'
--- a/storage/innobase/sync/sync0sync.c	revid:marko.makela@strippedjpau
+++ b/storage/innobase/sync/sync0sync.c	revid:sunny.bains@stripped
@@ -1525,7 +1525,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) {
@@ -1535,6 +1535,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-20110125224940-ou7e1rruc2se7jpl.bundle
Thread
bzr push into mysql-trunk-innodb branch (Sunny.Bains:3459 to 3460) Sunny Bains25 Jan