List:Commits« Previous MessageNext Message »
From:marko.makela Date:May 17 2011 12:25pm
Subject:bzr push into mysql-5.5-innodb branch (marko.makela:3378 to 3379)
Bug#12543706
View as plain text  
 3379 Marko Mäkelä	2011-05-17
      Bug#12543706 - innodb-fast-shutdown=2: Assert
      node->modification_counter == node->flush_counter
      
      This bug (an assertion failure during a crash-like shutdown)
      was introduced by the fix of
      Bug#12323643 Clean up the InnoDB thread shutdown and assertions (WL#5136).
      
      fil_node_close_file(): Relax the failing assertion
      when innodb_fast_shutdown=2.

    modified:
      storage/innobase/fil/fil0fil.c
 3378 Vasil Dimov	2011-05-10 [merge]
      Null merge mysql-5.1-innodb -> mysql-5.5-innodb
      (the change is irrelevant in 5.5)

=== modified file 'storage/innobase/fil/fil0fil.c'
--- a/storage/innobase/fil/fil0fil.c	revid:vasil.dimov@stripped053-spvv8avw8hkhdwrq
+++ b/storage/innobase/fil/fil0fil.c	revid:marko.makela@strippedkzep4
@@ -856,7 +856,8 @@ fil_node_close_file(
 	ut_a(node->open);
 	ut_a(node->n_pending == 0);
 	ut_a(node->n_pending_flushes == 0);
-	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/marko.makela@oracle.com-20110517121555-lmple24qzxqkzep4.bundle
Thread
bzr push into mysql-5.5-innodb branch (marko.makela:3378 to 3379)Bug#12543706marko.makela19 May