bzr commit into mysql-5.1-innodb branch (marko.makela:3476)

[marko.makela]

#At file:///home/marko/innobase/dev/mysql/5.1-innodb/ based on revid:marko.makela@strippedn60czp7o4m

 3476 Marko Mäkelä	2010-05-25
      Suppress bogus Valgrind warnings about buf_buddy_relocate()
      accessing uninitialized memory in Valgrind-instrumented builds.

    modified:
      mysql-test/valgrind.supp
      storage/innodb_plugin/buf/buf0buddy.c
=== modified file 'mysql-test/valgrind.supp'
--- a/mysql-test/valgrind.supp	revid:marko.makela@stripped0czp7o4m
+++ b/mysql-test/valgrind.supp	revid:marko.makela@stripped
@@ -722,3 +722,8 @@
    fun:pthread_create*
 }
 
+{
+   buf_buddy_relocate peeking (space,page) in potentially free blocks
+   Memcheck:Addr1
+   fun:buf_buddy_relocate
+}

=== modified file 'storage/innodb_plugin/buf/buf0buddy.c'
--- a/storage/innodb_plugin/buf/buf0buddy.c	revid:[e-mail]-20100520130734-ueow9mn60czp7o4m
+++ b/storage/innodb_plugin/buf/buf0buddy.c	revid:marko.makela@stripped20100525121038-ttnovwh7njl8o1m1
@@ -442,11 +442,15 @@ buf_buddy_relocate(
 		pool), so there is nothing wrong about this.  The
 		mach_read_from_4() calls here will only trigger bogus
 		Valgrind memcheck warnings in UNIV_DEBUG_VALGRIND builds. */
-		bpage = buf_page_hash_get(
-			mach_read_from_4((const byte*) src
-					 + FIL_PAGE_ARCH_LOG_NO_OR_SPACE_ID),
-			mach_read_from_4((const byte*) src
-					 + FIL_PAGE_OFFSET));
+		ulint		space	= mach_read_from_4(
+			(const byte*) src + FIL_PAGE_ARCH_LOG_NO_OR_SPACE_ID);
+		ulint		page_no	= mach_read_from_4(
+			(const byte*) src + FIL_PAGE_OFFSET);
+		/* Suppress Valgrind warnings about conditional jump
+		on uninitialized value. */
+		UNIV_MEM_VALID(&space, sizeof space);
+		UNIV_MEM_VALID(&page_no, sizeof page_no);
+		bpage = buf_page_hash_get(space, page_no);
 
 		if (!bpage || bpage->zip.data != src) {
 			/* The block has probably been freshly

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