1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix test case innodb.xa_recovery crash on xtradb.

Browse Source
This commit is contained in:
Jan Lindström 2015-06-16 17:33:21 +03:00
parent 96806025eb
commit 27f0bd7d95
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
storage/xtradb/srv/srv0start.cc
View File

@ -3197,9 +3197,9 @@ innobase_shutdown_for_mysql(void)
ibuf_close();
log_shutdown();
lock_sys_close();
trx_sys_file_format_close();
trx_sys_close();
lock_sys_close();
/* We don't create these mutexes in RO mode because we don't create
the temp files that the cover. */

5
storage/xtradb/trx/trx0trx.cc
View File

@ -473,11 +473,12 @@ trx_free_prepared(
/*==============*/
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->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);
assert_trx_in_rw_list(trx);