bzr push into mysql-trunk-innodb branch (marko.makela:3593 to 3594)

[marko.makela]

 3594 Marko Mäkelä	2011-04-20 [merge]
      Merge mysql-5.5-innodb to mysql-trunk-innodb.

    modified:
      storage/innobase/ibuf/ibuf0ibuf.c
 3593 Vasil Dimov	2011-04-19
      Fix compilation warnings when UNIV_SYNC_DEBUG is enabled
      
      mysql-trunk-innodb/storage/innobase/include/buf0buf.ic: 
      In function 'buf_page_hash_get_low':
      mysql-trunk-innodb/storage/innobase/include/buf0buf.ic:994: warning: ISO C90 forbids mixed declarations and code
      mysql-trunk-innodb/storage/innobase/ibuf/ibuf0ibuf.c: In 
      function 'ibuf_page_low':
      mysql-trunk-innodb/storage/innobase/ibuf/ibuf0ibuf.c:1203: warning: ISO C90 forbids mixed declarations and code

    modified:
      storage/innobase/ibuf/ibuf0ibuf.c
      storage/innobase/include/buf0buf.ic
=== modified file 'storage/innobase/ibuf/ibuf0ibuf.c'
--- a/storage/innobase/ibuf/ibuf0ibuf.c	revid:vasil.dimov@stripped9131651-u6o30y24rhwrdnxs
+++ b/storage/innobase/ibuf/ibuf0ibuf.c	revid:marko.makela@strippeda1q05mw43n3z
@@ -1176,10 +1176,6 @@ ibuf_page_low(
 
 #ifdef UNIV_DEBUG
 	if (!x_latch) {
-# ifdef UNIV_SYNC_DEBUG
-		void*	latch;
-# endif /* UNIV_SYNC_DEBUG */
-
 		mtr_start(&local_mtr);
 
 		/* Get the bitmap page without a page latch, so that
@@ -1199,18 +1195,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. */
-		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]