bzr push into mysql-5.1 branch (marko.makela:3646 to 3647)

[marko.makela]

 3647 Marko Mäkelä	2011-06-14
      Merge a fix from mysql-5.5 to mysql-5.1:
      
      revno 2995.37.209
      revision id marko.makela@strippedvz814vn77v5k
      parent marko.makela@stripped7121555-lmple24qzxqkzep4
      timestamp: Wed 2011-05-18 15:05:08 +0300
      message:
        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/innodb_plugin/trx/trx0undo.c
 3646 Mattias Jonsson	2011-06-13 [merge]
      merge

    modified:
      mysql-test/r/partition.result
      mysql-test/t/partition.test
      sql/ha_partition.cc
=== modified file 'storage/innodb_plugin/trx/trx0undo.c'
--- a/storage/innodb_plugin/trx/trx0undo.c	revid:mattias.jonsson@stripped0110613090956-b3gn23hutmafhb6e
+++ b/storage/innodb_plugin/trx/trx0undo.c	revid:marko.makela@stripped4032-ys8b6h6s77wurhuf
@@ -1986,8 +1986,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) {
@@ -2002,6 +2000,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]