diff --git a/storage/innobase/include/trx0rseg.h b/storage/innobase/include/trx0rseg.h
|
index dbd80486b71..794f4e66ca3 100644
|
--- a/storage/innobase/include/trx0rseg.h
|
+++ b/storage/innobase/include/trx0rseg.h
|
@@ -174,6 +174,8 @@ struct trx_rseg_t {
|
|
/** @return the commit ID of the last committed transaction */
|
trx_id_t last_trx_no() const { return last_commit >> 1; }
|
+ /** @return whether the last committed transaction is an update */
|
+ bool last_is_update() const { return bool(last_commit & 1); }
|
|
void set_last_trx_no(trx_id_t trx_no, bool is_update)
|
{
|
diff --git a/storage/innobase/trx/trx0purge.cc b/storage/innobase/trx/trx0purge.cc
|
index 32e050e9b91..b3c6f41827e 100644
|
--- a/storage/innobase/trx/trx0purge.cc
|
+++ b/storage/innobase/trx/trx0purge.cc
|
@@ -118,9 +118,11 @@ inline bool TrxUndoRsegsIterator::set_next()
|
ut_ad(purge_sys.rseg->space->id == TRX_SYS_SPACE
|
|| srv_is_undo_tablespace(purge_sys.rseg->space->id));
|
|
- ut_a(purge_sys.tail.commit <= purge_sys.rseg->last_commit);
|
+ if (purge_sys.rseg->last_is_update()) {
|
+ ut_a(purge_sys.tail.commit <= purge_sys.rseg->last_commit);
|
+ purge_sys.tail.commit = purge_sys.rseg->last_commit;
|
+ }
|
|
- purge_sys.tail.commit = purge_sys.rseg->last_commit;
|
purge_sys.hdr_offset = purge_sys.rseg->last_offset;
|
purge_sys.hdr_page_no = purge_sys.rseg->last_page_no;
|
|
@@ -307,10 +309,13 @@ trx_purge_add_undo_to_history(const trx_t* trx, trx_undo_t*& undo, mtr_t* mtr)
|
MLOG_2BYTES, mtr);
|
}
|
|
- if (rseg->last_page_no == FIL_NULL) {
|
+ const bool is_update = undo == trx->rsegs.m_redo.undo;
|
+
|
+ if (rseg->last_page_no == FIL_NULL
|
+ || (is_update && !rseg->last_is_update())) {
|
rseg->last_page_no = undo->hdr_page_no;
|
rseg->last_offset = undo->hdr_offset;
|
- rseg->set_last_trx_no(trx->no, undo == trx->rsegs.m_redo.undo);
|
+ rseg->set_last_trx_no(trx->no, is_update);
|
rseg->needs_purge = true;
|
}
|
|
@@ -1048,9 +1053,11 @@ static void trx_purge_truncate_history()
|
purge_sys_t::iterator& head = purge_sys.head.commit
|
? purge_sys.head : purge_sys.tail;
|
|
- if (head.trx_no() >= purge_sys.view.low_limit_no()) {
|
+ const trx_id_t low_limit = purge_sys.view.low_limit_no();
|
+ if (head.trx_no() >= low_limit) {
|
/* This is sometimes necessary. TODO: find out why. */
|
- head.reset_trx_no(purge_sys.view.low_limit_no());
|
+ ib::info() << "reset " << head.trx_no() << " to " << low_limit;
|
+ head.reset_trx_no(low_limit);
|
head.undo_no = 0;
|
}
|
|
ib_logfile0.bz2
