bzr commit into mysql-trunk-innodb branch (marko.makela:3630)

[marko.makela]

#At file:///home/marko/innobase/dev/mysql2a/5.6-innodb/ based on revid:marko.makela@strippedx9z36r2tumzz

 3630 Marko Mäkelä	2011-05-17 [merge]
      Merge mysql-5.5-innodb to mysql-trunk-innodb.

    modified:
      storage/innobase/fil/fil0fil.c
=== modified file 'storage/innobase/fil/fil0fil.c'
--- a/storage/innobase/fil/fil0fil.c	revid:marko.makela@stripped14210-e7dfx9z36r2tumzz
+++ b/storage/innobase/fil/fil0fil.c	revid:marko.makela@strippednx5qkc4
@@ -852,7 +852,8 @@ fil_node_close_file(
 	ut_a(node->n_pending == 0);
 	ut_a(node->n_pending_flushes == 0);
 	ut_a(!node->being_extended);
-	ut_a(node->modification_counter == node->flush_counter);
+	ut_a(node->modification_counter == node->flush_counter
+	     || srv_fast_shutdown == 2);
 
 	ret = os_file_close(node->handle);
 	ut_a(ret);

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