bzr push into mysql-5.5-innodb branch (marko.makela:3379 to 3380) Bug#59641 Bug#11766513

[marko.makela]

 3380 Marko Mäkelä	2011-05-18
      Fix a bogus UNIV_SYNC_DEBUG failure in the fix of Bug #59641
      or Oracle Bug #11766513.
      
      trx_undo_free_prepared(): Do not acquire or release trx->rseg->mutex.
      This code is invoked in the single-threaded part of shutdown, therefore
      a mutex is not needed.

    modified:
      storage/innobase/trx/trx0undo.c
 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
=== modified file 'storage/innobase/trx/trx0undo.c'
--- a/storage/innobase/trx/trx0undo.c	revid:[e-mail]-20110517121555-lmple24qzxqkzep4
+++ b/storage/innobase/trx/trx0undo.c	revid:marko.makela@stripped20508-qhn7vz814vn77v5k
@@ -1985,8 +1985,6 @@ trx_undo_free_prepared(
 /*===================*/
 	trx_t*	trx)	/*!< in/out: PREPARED transaction */
 {
-	mutex_enter(&trx->rseg->mutex);
-
 	ut_ad(srv_shutdown_state == SRV_SHUTDOWN_EXIT_THREADS);
 
 	if (trx->update_undo) {
@@ -2001,6 +1999,5 @@ trx_undo_free_prepared(
 			       trx->insert_undo);
 		trx_undo_mem_free(trx->insert_undo);
 	}
-	mutex_exit(&trx->rseg->mutex);
 }
 #endif /* !UNIV_HOTBACKUP */

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