List:Commits« Previous MessageNext Message »
From:vasil.dimov Date:April 19 2011 1:18pm
Subject:bzr commit into mysql-trunk-innodb branch (vasil.dimov:3593)
View as plain text  
#At file:///usr/local/devel/bzrroot/server/mysql-trunk-innodb/ based on revid:sunny.bains@stripped

 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:sunny.bains@stripped
+++ b/storage/innobase/ibuf/ibuf0ibuf.c	revid:vasil.dimov@stripped
@@ -1176,6 +1176,10 @@ 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
@@ -1200,7 +1204,7 @@ ibuf_page_low(
 		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);
+		latch = sync_thread_levels_contains(SYNC_IBUF_BITMAP);
 		if (latch) {
 			fprintf(stderr, "Bug#58212 UNIV_SYNC_DEBUG"
 				" levels %p (%u,%u)\n",

=== modified file 'storage/innobase/include/buf0buf.ic'
--- a/storage/innobase/include/buf0buf.ic	revid:sunny.bains@stripped
+++ b/storage/innobase/include/buf0buf.ic	revid:vasil.dimov@stripped
@@ -988,8 +988,6 @@ buf_page_hash_get_low(
 {
 	buf_page_t*	bpage;
 
-	ut_ad(buf_pool);
-
 #ifdef UNIV_SYNC_DEBUG
 	ulint		hash_fold;
 	rw_lock_t*	hash_lock;


Attachment: [text/bzr-bundle] bzr/vasil.dimov@oracle.com-20110419131651-u6o30y24rhwrdnxs.bundle
Thread
bzr commit into mysql-trunk-innodb branch (vasil.dimov:3593) vasil.dimov19 Apr