diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-01-04 09:22:59 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-01-04 09:22:59 +0200 |
| commit | 145ae15a33210e13d33d6f41b145b3f04cab2263 (patch) | |
| tree | 02810e3c0d629f7d7def2dbc663154cbdb53242f /storage/innobase/include/trx0sys.ic | |
| parent | acd2862e65a6555fba6065b7b4ded8513e2ce37c (diff) | |
| parent | 1a1bda2222e0c2ab41baed1510f6fbca80c20d31 (diff) | |
| download | mariadb-git-145ae15a33210e13d33d6f41b145b3f04cab2263.tar.gz | |
Merge bb-10.2-ext into 10.3
Diffstat (limited to 'storage/innobase/include/trx0sys.ic')
| -rw-r--r-- | storage/innobase/include/trx0sys.ic | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/storage/innobase/include/trx0sys.ic b/storage/innobase/include/trx0sys.ic index 5271601b4ea..020a46fb028 100644 --- a/storage/innobase/include/trx0sys.ic +++ b/storage/innobase/include/trx0sys.ic @@ -376,10 +376,8 @@ trx_id_t trx_sys_get_new_trx_id() /*====================*/ { -#ifndef WITH_WSREP /* wsrep_fake_trx_id violates this assert */ ut_ad(trx_sys_mutex_own()); -#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 |