bzr push into mysql-trunk branch (satya.bodapati:4076 to 4077) Bug#14212892

[Satya Bodapati]

 4077 Satya Bodapati	2012-07-18 [merge]
      merge fix for BUG#14212892 from 5.6 to trunk

    modified:
      storage/innobase/buf/buf0buf.cc
 4076 Bjorn Munch	2012-07-18 [merge]
      upmerge 14336086 5.6 -> trunk

    modified:
      mysql-test/mysql-test-run.pl
=== modified file 'storage/innobase/buf/buf0buf.cc'
--- a/storage/innobase/buf/buf0buf.cc	revid:bjorn.munch@stripped
+++ b/storage/innobase/buf/buf0buf.cc	revid:satya.bodapati@stripped
@@ -2710,7 +2710,10 @@ wait_until_unfixed:
 		/* Decompress the page and apply buffered operations
 		while not holding buf_pool->mutex or block->mutex. */
 
-		ut_a(buf_zip_decompress(block, TRUE));
+		/* Page checksum verification is already done when
+		the page is read from disk. Hence page checksum
+		verification is not necesary when decompressing the page. */
+		ut_a(buf_zip_decompress(block, FALSE));
 
 		if (UNIV_LIKELY(!recv_no_ibuf_operations)) {
 			ibuf_merge_or_delete_for_page(block, space, offset,

No bundle (reason: useless for push emails).