diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-05-14 17:25:25 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-05-14 17:25:25 +0300 |
commit | 874f8f30f2319166ff08509937d4eab366607c6b (patch) | |
tree | fe092349aca8363b009e6235dacd9816a29b93aa /storage/innobase/trx/trx0purge.cc | |
parent | be85d3e61bb4217453a6879cb28d9bd369ad17dd (diff) | |
parent | 50999738eaed907cfd94b554582b5416e0107642 (diff) | |
download | mariadb-git-874f8f30f2319166ff08509937d4eab366607c6b.tar.gz |
Merge 10.2 into 10.3
Diffstat (limited to 'storage/innobase/trx/trx0purge.cc')
-rw-r--r-- | storage/innobase/trx/trx0purge.cc | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/storage/innobase/trx/trx0purge.cc b/storage/innobase/trx/trx0purge.cc index 626a2bc16be..838b4291e58 100644 --- a/storage/innobase/trx/trx0purge.cc +++ b/storage/innobase/trx/trx0purge.cc @@ -192,10 +192,6 @@ void purge_sys_t::close() trx->state= TRX_STATE_NOT_STARTED; trx_free(trx); rw_lock_free(&latch); - /* rw_lock_free() already called latch.~rw_lock_t(); tame the - debug assertions when the destructor will be called once more. */ - ut_ad(latch.magic_n == 0); - ut_d(latch.magic_n= RW_LOCK_MAGIC_N); mutex_free(&pq_mutex); os_event_destroy(event); } |