bzr push into mysql-5.5 branch (marko.makela:3685 to 3686)

[marko.makela]

 3686 Marko Mäkelä	2012-01-16 [merge]
      Merge mysql-5.1 to mysql-5.5.

    modified:
      storage/innobase/buf/buf0buf.c
 3685 Annamalai Gurusami	2012-01-16 [merge]
      Merging from mysql-5.1 to mysql-5.5. 

    modified:
      storage/innobase/handler/ha_innodb.cc
=== modified file 'storage/innobase/buf/buf0buf.c'
--- a/storage/innobase/buf/buf0buf.c	revid:annamalai.gurusami@stripped20120116050051-hf9wdp5r2drru33y
+++ b/storage/innobase/buf/buf0buf.c	revid:marko.makela@strippedswkkw2muc074wjvq
@@ -2830,7 +2830,7 @@ buf_page_get_known_nowait(
 	ut_a(buf_block_get_state(block) == BUF_BLOCK_FILE_PAGE);
 #endif /* UNIV_DEBUG || UNIV_BUF_DEBUG */
 #if defined UNIV_DEBUG_FILE_ACCESSES || defined UNIV_DEBUG
-	ut_a(block->page.file_page_was_freed == FALSE);
+	ut_a(mode == BUF_KEEP_OLD || !block->page.file_page_was_freed);
 #endif
 
 #ifdef UNIV_IBUF_COUNT_DEBUG

No bundle (reason: useless for push emails).