bzr push into mysql-5.1 branch (marko.makela:3666 to 3667)

[marko.makela]

 3667 Marko Mäkelä	2012-01-16
      buf_page_get_known_nowait(): Relax a bogus debug assertion.
      When mode==BUF_KEEP_OLD, buffered inserts are being merged to the page.
      It is possible that a read request for a page was pending while the page
      was freed in DROP INDEX or DROP TABLE. In these cases, it is OK (although
      useless) to merge the buffered changes to the freed page.

    modified:
      storage/innodb_plugin/buf/buf0buf.c
 3666 Annamalai Gurusami	2012-01-16
      Bug #11765438 58406: 
      ISSUES WITH COPYING PARTITIONED INNODB TABLES FROM LINUX TO WINDOWS
      
      This problem was already fixed in mysql-trunk as part of bug #11755924.  I am 
      backporting the fix to mysql-5.1.  

    modified:
      storage/innobase/handler/ha_innodb.cc
      storage/innobase/include/univ.i
      storage/innodb_plugin/ChangeLog
      storage/innodb_plugin/handler/ha_innodb.cc
=== modified file 'storage/innodb_plugin/buf/buf0buf.c'
--- a/storage/innodb_plugin/buf/buf0buf.c	revid:annamalai.gurusami@stripped
+++ b/storage/innodb_plugin/buf/buf0buf.c	revid:[e-mail]-20120116075512-28r2tpv4fdp6d0md
@@ -2148,7 +2148,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).