List:Commits« Previous MessageNext Message »
From:marko.makela Date:June 22 2010 10:43am
Subject:bzr commit into mysql-trunk-innodb branch (marko.makela:3112)
View as plain text  
#At file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ based on revid:marko.makela@strippedu70us50jaqfs

 3112 Marko Mäkelä	2010-06-22
      buf_flush_insert_in_flush_rbt(), buf_flush_validate_low():
      Silence GCC warnings about dereferencing a type-punned pointer.
      Approved by Jimmy Yang.

    modified:
      storage/innobase/buf/buf0flu.c
=== modified file 'storage/innobase/buf/buf0flu.c'
--- a/storage/innobase/buf/buf0flu.c	revid:marko.makela@strippedbu70us50jaqfs
+++ b/storage/innobase/buf/buf0flu.c	revid:marko.makela@stripped
@@ -114,7 +114,9 @@ buf_flush_insert_in_flush_rbt(
 	p_node = rbt_prev(buf_pool->flush_rbt, c_node);
 
 	if (p_node != NULL) {
-		prev = *rbt_value(buf_page_t*, p_node);
+		buf_page_t**	value;
+		value = rbt_value(buf_page_t*, p_node);
+		prev = *value;
 		ut_a(prev != NULL);
 	}
 
@@ -2088,13 +2090,13 @@ buf_flush_validate_low(
 		ut_a(om > 0);
 
 		if (UNIV_LIKELY_NULL(buf_pool->flush_rbt)) {
-			buf_page_t* rpage;
+			buf_page_t** prpage;
 
 			ut_a(rnode);
-			rpage = *rbt_value(buf_page_t*, rnode);
+			prpage = rbt_value(buf_page_t*, rnode);
 
-			ut_a(rpage);
-			ut_a(rpage == bpage);
+			ut_a(*prpage);
+			ut_a(*prpage == bpage);
 			rnode = rbt_next(buf_pool->flush_rbt, rnode);
 		}
 

Attachment: [text/bzr-bundle] bzr/marko.makela@oracle.com-20100622104317-5xl3suwp1hqjtd80.bundle
Thread
bzr commit into mysql-trunk-innodb branch (marko.makela:3112) marko.makela22 Jun