bzr push into mysql-5.5-innodb branch (marko.makela:3365 to 3366)

[marko.makela]

 3366 Marko Mäkelä	2011-04-20
      Remove a debug printout that is no longer needed.

    modified:
      storage/innobase/ibuf/ibuf0ibuf.c
 3365 Marko Mäkelä	2011-04-12
      Bug #12329920 ASSERT UT_ERROR IN SYNC_THREAD_LEVELS_NONEMPTY_TRX
      SRV_CONC_FORCE_EXIT_INNODB
      
      This is a bogus UNIV_SYNC_DEBUG assertion failure that I introduced
      when introducing assertions for checking that InnoDB is not holding
      any mutexes or rw-locks when returning control to MySQL.
      
      srv_suspend_mysql_thread(): Release dict_operation_lock before
      invoking srv_conc_force_exit_innodb(), which would now check that the
      thread is not holding any mutexes or rw-locks.  After resuming, check
      sync_thread_levels_nonempty_trx() and do srv_conc_force_enter_innodb()
      before reacquiring the dict_operation_lock.
      
      rb:646 approved by Sunny Bains

    modified:
      storage/innobase/srv/srv0srv.c
=== modified file 'storage/innobase/ibuf/ibuf0ibuf.c'
--- a/storage/innobase/ibuf/ibuf0ibuf.c	revid:marko.makela@stripped243-1h0zori8j3my3tp0
+++ b/storage/innobase/ibuf/ibuf0ibuf.c	revid:marko.makela@strippedacjfz9hm
@@ -1179,18 +1179,7 @@ ibuf_page_low(
 				ibuf_bitmap_page_no_calc(zip_size, page_no),
 				RW_NO_LATCH, NULL, BUF_GET_NO_LATCH,
 				file, line, &local_mtr));
-# ifdef UNIV_SYNC_DEBUG
-		/* This is for tracking Bug #58212. This check and message can
-		be removed once it has been established that our assumptions
-		about this condition are correct. The bug was only a one-time
-		occurrence, unable to repeat since then. */
-		void* latch = sync_thread_levels_contains(SYNC_IBUF_BITMAP);
-		if (latch) {
-			fprintf(stderr, "Bug#58212 UNIV_SYNC_DEBUG"
-				" levels %p (%u,%u)\n",
-				latch, (unsigned) space, (unsigned) page_no);
-		}
-# endif /* UNIV_SYNC_DEBUG */
+
 		ret = ibuf_bitmap_page_get_bits_low(
 			bitmap_page, page_no, zip_size,
 			MTR_MEMO_BUF_FIX, &local_mtr, IBUF_BITMAP_IBUF);

Attachment: [text/bzr-bundle] bzr/[e-mail]