mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 20:42:30 +01:00
MDEV-28049 Error on compiling trx0purge.cc
In commit 83212632e4
the trx_rseg_latch was instrumented for performance_schema,
but some acqusitions of rd_lock() were not adjusted.
Thus, the build would fail on platforms where a futex-based
rw-lock is not available (SUX_LOCK_GENERIC) unless the code
was built with cmake -DPLUGIN_PERFSCHEMA=NO.
This commit is contained in:
parent
e0dc22b2d4
commit
3b49967936
1 changed files with 2 additions and 2 deletions
|
@ -119,7 +119,7 @@ TRANSACTIONAL_INLINE inline bool TrxUndoRsegsIterator::set_next()
|
|||
trx_id_t last_trx_no, tail_trx_no;
|
||||
{
|
||||
#ifdef SUX_LOCK_GENERIC
|
||||
purge_sys.rseg->latch.rd_lock();
|
||||
purge_sys.rseg->latch.rd_lock(SRW_LOCK_CALL);
|
||||
#else
|
||||
transactional_shared_lock_guard<srw_spin_lock> rg
|
||||
{purge_sys.rseg->latch};
|
||||
|
@ -636,7 +636,7 @@ TRANSACTIONAL_TARGET static void trx_purge_truncate_history()
|
|||
if (rseg.space != &space)
|
||||
continue;
|
||||
#ifdef SUX_LOCK_GENERIC
|
||||
rseg.latch.rd_lock();
|
||||
rseg.latch.rd_lock(SRW_LOCK_CALL);
|
||||
#else
|
||||
transactional_shared_lock_guard<srw_spin_lock> g{rseg.latch};
|
||||
#endif
|
||||
|
|
Loading…
Reference in a new issue