bzr push into mysql-trunk branch (mikael.ronstrom:3917 to 3918) WL#5666

[Mikael Ronstrom]

 3918 Mikael Ronstrom	2012-05-31
      Fix WL#5666, adaptive flushing issue

    modified:
      storage/innobase/buf/buf0flu.cc
 3917 Mikael Ronstrom	2012-05-31
      BUG#13903821, fix a memory leak at inserts

    modified:
      storage/innobase/btr/btr0cur.cc
      storage/innobase/include/dict0dict.h
      storage/innobase/include/dict0dict.ic
      storage/innobase/include/row0mysql.h
      storage/innobase/row/row0ins.cc
      storage/innobase/row/row0mysql.cc
=== modified file 'storage/innobase/buf/buf0flu.cc'
--- a/storage/innobase/buf/buf0flu.cc	revid:mikael.ronstrom@stripped
+++ b/storage/innobase/buf/buf0flu.cc	revid:mikael.ronstrom@stripped
@@ -2282,6 +2282,7 @@ page_cleaner_flush_pages_if_needed(void)
 
 	MONITOR_SET(MONITOR_FLUSH_N_TO_FLUSH_REQUESTED, n_pages);
 
+        prev_pages= n_pages;
 	n_pages = page_cleaner_do_flush_batch(
 		n_pages, oldest_lsn + lsn_avg_rate * (age_factor + 1));
 

No bundle (reason: useless for push emails).