diff options
| author | Nirbhay Choubey <nirbhay@skysql.com> | 2014-03-27 16:26:00 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@skysql.com> | 2014-03-27 16:26:00 -0400 |
| commit | 02ba2bfdb444531e6fe61716a4eaeab40e210bbd (patch) | |
| tree | 0b67ad5b8f6e8a901ed2b6cac8d4692d8db8f112 /storage/innobase/trx/trx0sys.cc | |
| parent | 09e3094945694277a550cccc8bd1fd11338474b1 (diff) | |
| parent | c5f7486654d7fd4941b202735799f9a7ec3c15eb (diff) | |
| download | mariadb-git-02ba2bfdb444531e6fe61716a4eaeab40e210bbd.tar.gz | |
Merging revision from codership-mysql/5.5 (r3928..3968) and
codership-mysql/5.6 (r4021..4065).
- Also contains fixes for some build failures.
Diffstat (limited to 'storage/innobase/trx/trx0sys.cc')
| -rw-r--r-- | storage/innobase/trx/trx0sys.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/storage/innobase/trx/trx0sys.cc b/storage/innobase/trx/trx0sys.cc index cc1c095f16e..4af61d4869b 100644 --- a/storage/innobase/trx/trx0sys.cc +++ b/storage/innobase/trx/trx0sys.cc @@ -178,7 +178,12 @@ trx_sys_flush_max_trx_id(void) mtr_t mtr; trx_sysf_t* sys_header; +#ifndef WITH_WSREP + /* wsrep_fake_trx_id violates this assert + * Copied from trx_sys_get_new_trx_id + */ ut_ad(mutex_own(&trx_sys->mutex)); +#endif /* WITH_WSREP */ if (!srv_read_only_mode) { mtr_start(&mtr); |