Skip to content

Commit 1cf2896

Browse files
committed
MDEV-6247 post-fix: Re-enable some debug assertions
These assertions were disabled in MariaDB 10.1.1 in commit df4dd59 with a bogus comment referring to the function wsrep_fake_trx_id() that was introduced in the very same commit.
1 parent 5f896b3 commit 1cf2896

File tree

4 files changed

+0
-16
lines changed

4 files changed

+0
-16
lines changed

storage/innobase/include/trx0sys.ic

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -445,10 +445,7 @@ trx_id_t
445445
trx_sys_get_new_trx_id(void)
446446
/*========================*/
447447
{
448-
#ifndef WITH_WSREP
449-
/* wsrep_fake_trx_id violates this assert */
450448
ut_ad(mutex_own(&trx_sys->mutex));
451-
#endif /* WITH_WSREP */
452449

453450
/* VERY important: after the database is started, max_trx_id value is
454451
divisible by TRX_SYS_TRX_ID_WRITE_MARGIN, and the following if

storage/innobase/trx/trx0sys.cc

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -180,12 +180,7 @@ trx_sys_flush_max_trx_id(void)
180180
mtr_tmtr;
181181
trx_sysf_t* sys_header;
182182

183-
#ifndef WITH_WSREP
184-
/* wsrep_fake_trx_id violates this assert
185-
* Copied from trx_sys_get_new_trx_id
186-
*/
187183
ut_ad(mutex_own(&trx_sys->mutex));
188-
#endif /* WITH_WSREP */
189184

190185
if (!srv_read_only_mode) {
191186
mtr_start(&mtr);

storage/xtradb/include/trx0sys.ic

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -474,10 +474,7 @@ trx_id_t
474474
trx_sys_get_new_trx_id(void)
475475
/*========================*/
476476
{
477-
#ifndef WITH_WSREP
478-
/* wsrep_fake_trx_id violates this assert */
479477
ut_ad(mutex_own(&trx_sys->mutex));
480-
#endif /* WITH_WSREP */
481478

482479
/* VERY important: after the database is started, max_trx_id value is
483480
divisible by TRX_SYS_TRX_ID_WRITE_MARGIN, and the following if

storage/xtradb/trx/trx0sys.cc

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -184,12 +184,7 @@ trx_sys_flush_max_trx_id(void)
184184
mtr_tmtr;
185185
trx_sysf_t* sys_header;
186186

187-
#ifndef WITH_WSREP
188-
/* wsrep_fake_trx_id violates this assert
189-
* Copied from trx_sys_get_new_trx_id
190-
*/
191187
ut_ad(mutex_own(&trx_sys->mutex));
192-
#endif /* WITH_WSREP */
193188

194189
if (!srv_read_only_mode) {
195190
mtr_start(&mtr);

0 commit comments

Comments
 (0)