From 1cf28964f50443518d8b665b226c1666274840e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= Date: Thu, 21 Dec 2017 10:19:49 +0200 Subject: MDEV-6247 post-fix: Re-enable some debug assertions These assertions were disabled in MariaDB 10.1.1 in commit df4dd593f29aec8e2116aec1775ad4b8833d8c93 with a bogus comment referring to the function wsrep_fake_trx_id() that was introduced in the very same commit. --- storage/innobase/include/trx0sys.ic | 3 --- 1 file changed, 3 deletions(-) (limited to 'storage/innobase/include/trx0sys.ic') diff --git a/storage/innobase/include/trx0sys.ic b/storage/innobase/include/trx0sys.ic index 7265a97ae25..e097e29b551 100644 --- a/storage/innobase/include/trx0sys.ic +++ b/storage/innobase/include/trx0sys.ic @@ -445,10 +445,7 @@ trx_id_t trx_sys_get_new_trx_id(void) /*========================*/ { -#ifndef WITH_WSREP - /* wsrep_fake_trx_id violates this assert */ ut_ad(mutex_own(&trx_sys->mutex)); -#endif /* WITH_WSREP */ /* VERY important: after the database is started, max_trx_id value is divisible by TRX_SYS_TRX_ID_WRITE_MARGIN, and the following if -- cgit v1.2.1