diff options
| author | Marko Mäkelä <marko.makela@oracle.com> | 2011-06-14 08:40:32 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@oracle.com> | 2011-06-14 08:40:32 +0300 |
| commit | 98d527d3cb89b5e7f8e14d4e5ccf43b03b6f6e25 (patch) | |
| tree | 3e0cb605ca747b617c351024f1abba90721fda63 | |
| parent | 44aa582bb3e9479917a120d819aa95dc285f4f68 (diff) | |
| download | mariadb-git-98d527d3cb89b5e7f8e14d4e5ccf43b03b6f6e25.tar.gz | |
Merge a fix from mysql-5.5 to mysql-5.1:
revno 2995.37.209
revision id marko.makela@oracle.com-20110518120508-qhn7vz814vn77v5k
parent marko.makela@oracle.com-20110517121555-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.
| -rw-r--r-- | storage/innodb_plugin/trx/trx0undo.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/storage/innodb_plugin/trx/trx0undo.c b/storage/innodb_plugin/trx/trx0undo.c index 68ff82f618c..7f03b68fb55 100644 --- a/storage/innodb_plugin/trx/trx0undo.c +++ b/storage/innodb_plugin/trx/trx0undo.c @@ -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 */ |