bzr push into mysql-trunk branch (marko.makela:3225 to 3226)

[marko.makela]

 3226 Marko Mäkelä	2011-06-22 [merge]
      Merge mysql-5.5 to mysql-trunk.

    modified:
      storage/innobase/buf/buf0buddy.c
 3225 Matthias Leich	2011-06-21
      Fix for Bug 12431362 - THE TESTS PERFSCHEMA.ALL_TESTS DOES NOT CLEAN UP PROPERLY.

    modified:
      mysql-test/suite/perfschema/r/all_tests.result
      mysql-test/suite/perfschema/t/all_tests.test
=== modified file 'storage/innobase/buf/buf0buddy.c'
--- a/storage/innobase/buf/buf0buddy.c	revid:matthias.leich@strippedics1pynl8e47g
+++ b/storage/innobase/buf/buf0buddy.c	revid:marko.makela@stripped
@@ -381,6 +381,8 @@ buf_buddy_relocate(
 		return(FALSE);
 	}
 
+	ut_ad(!buf_pool_watch_is_sentinel(buf_pool, bpage));
+
 	if (page_zip_get_size(&bpage->zip) != size) {
 		/* The block is of different size.  We would
 		have to relocate all blocks covered by src.

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