bzr commit into mysql-trunk-innodb branch (marko.makela:3105)

[marko.makela]

#At file:///home/marko/innobase/dev/mysql/5.5-innodb/ based on revid:inaam.rana@strippeda0u212rc

 3105 Marko Mäkelä	2010-05-19
      Merge a change from mysql-5.1-innodb:
      
      ------------------------------------------------------------
      revno: 3471
      revision-id: marko.makela@stripped9080152-h3555oqmu3wo95so
      parent: [e-mail]-20100519075843-4gl3uijo6cwjtcf9
      committer: Marko Mäkelä <marko.makela@stripped>
      branch nick: 5.1-innodb
      timestamp: Wed 2010-05-19 11:01:52 +0300
      message:
        Silence some more bogus Valgrind warnings on non-32-bit systems. (Bug #53307)

    modified:
      storage/innobase/buf/buf0buddy.c
      storage/innobase/buf/buf0lru.c
      storage/innobase/page/page0zip.c
=== modified file 'storage/innobase/buf/buf0buddy.c'
--- a/storage/innobase/buf/buf0buddy.c	revid:[e-mail]-20100518165302-ovf5fqn6a0u212rc
+++ b/storage/innobase/buf/buf0buddy.c	revid:marko.makela@stripped100519093627-nasfm1bo837lyrkm
@@ -502,7 +502,12 @@ success:
 		mutex_exit(mutex);
 	} else if (i == buf_buddy_get_slot(sizeof(buf_page_t))) {
 		/* This must be a buf_page_t object. */
+#if UNIV_WORD_SIZE == 4
+		/* On 32-bit systems, there is no padding in
+		buf_page_t.  On other systems, Valgrind could complain
+		about uninitialized pad bytes. */
 		UNIV_MEM_ASSERT_RW(src, size);
+#endif
 		if (buf_buddy_relocate_block(src, dst)) {
 
 			goto success;

=== modified file 'storage/innobase/buf/buf0lru.c'
--- a/storage/innobase/buf/buf0lru.c	revid:[e-mail]-20100518165302-ovf5fqn6a0u212rc
+++ b/storage/innobase/buf/buf0lru.c	revid:marko.makela@stripped093627-nasfm1bo837lyrkm
@@ -1578,8 +1578,13 @@ alloc:
 
 				ut_ad(prev_b->in_LRU_list);
 				ut_ad(buf_page_in_file(prev_b));
+#if UNIV_WORD_SIZE == 4
+				/* On 32-bit systems, there is no
+				padding in buf_page_t.  On other
+				systems, Valgrind could complain about
+				uninitialized pad bytes. */
 				UNIV_MEM_ASSERT_RW(prev_b, sizeof *prev_b);
-
+#endif
 				UT_LIST_INSERT_AFTER(LRU, buf_pool->LRU,
 						     prev_b, b);
 

=== modified file 'storage/innobase/page/page0zip.c'
--- a/storage/innobase/page/page0zip.c	revid:inaam.rana@stripped02-ovf5fqn6a0u212rc
+++ b/storage/innobase/page/page0zip.c	revid:marko.makela@stripped7lyrkm
@@ -3117,8 +3117,13 @@ page_zip_validate_low(
 	temp_page_zip in a debugger when running valgrind --db-attach. */
 	VALGRIND_GET_VBITS(page, temp_page, UNIV_PAGE_SIZE);
 	UNIV_MEM_ASSERT_RW(page, UNIV_PAGE_SIZE);
+# if UNIV_WORD_SIZE == 4
 	VALGRIND_GET_VBITS(page_zip, &temp_page_zip, sizeof temp_page_zip);
+	/* On 32-bit systems, there is no padding in page_zip_des_t.
+	On other systems, Valgrind could complain about uninitialized
+	pad bytes. */
 	UNIV_MEM_ASSERT_RW(page_zip, sizeof *page_zip);
+# endif
 	VALGRIND_GET_VBITS(page_zip->data, temp_page,
 			   page_zip_get_size(page_zip));
 	UNIV_MEM_ASSERT_RW(page_zip->data, page_zip_get_size(page_zip));

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