Commit 27f0bd7d authored by Jan Lindström's avatar Jan Lindström

Fix test case innodb.xa_recovery crash on xtradb.

parent 96806025
...@@ -3197,9 +3197,9 @@ innobase_shutdown_for_mysql(void) ...@@ -3197,9 +3197,9 @@ innobase_shutdown_for_mysql(void)
ibuf_close(); ibuf_close();
log_shutdown(); log_shutdown();
lock_sys_close();
trx_sys_file_format_close(); trx_sys_file_format_close();
trx_sys_close(); trx_sys_close();
lock_sys_close();
/* We don't create these mutexes in RO mode because we don't create /* We don't create these mutexes in RO mode because we don't create
the temp files that the cover. */ the temp files that the cover. */
......
...@@ -473,11 +473,12 @@ trx_free_prepared( ...@@ -473,11 +473,12 @@ trx_free_prepared(
/*==============*/ /*==============*/
trx_t* trx) /*!< in, own: trx object */ trx_t* trx) /*!< in, own: trx object */
{ {
ut_ad(mutex_own(&trx_sys->mutex));
ut_a(trx_state_eq(trx, TRX_STATE_PREPARED)); ut_a(trx_state_eq(trx, TRX_STATE_PREPARED));
ut_a(trx->magic_n == TRX_MAGIC_N); ut_a(trx->magic_n == TRX_MAGIC_N);
mutex_exit(&trx_sys->mutex);
lock_trx_release_locks(trx);
mutex_enter(&trx_sys->mutex);
trx_undo_free_prepared(trx); trx_undo_free_prepared(trx);
assert_trx_in_rw_list(trx); assert_trx_in_rw_list(trx);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment