diff options
| author | Seppo Jaakola <seppo.jaakola@codership.com> | 2013-12-04 10:32:43 +0200 |
|---|---|---|
| committer | Seppo Jaakola <seppo.jaakola@codership.com> | 2013-12-04 10:32:43 +0200 |
| commit | 496e22cf3bd2a481fd3502d86e5a4e8228bf9823 (patch) | |
| tree | 80549f8005fcf3236bfa004a5aea35e4e67b36ca /storage/innobase/trx/trx0sys.cc | |
| parent | 45f484b8381a5923aec9c704e54c7f7bcfa02a40 (diff) | |
| parent | 26f56089c734852dc31d98fd73e1d8f1750bd1a8 (diff) | |
| download | mariadb-git-496e22cf3bd2a481fd3502d86e5a4e8228bf9823.tar.gz | |
merge with MariaDB 5.6 bzr merge lp:maria --rtag:mariadb-10.0.6
and a number of fixes to make this buildable.
Run also few short multi-master high conflict rate tests, with no issues
Diffstat (limited to 'storage/innobase/trx/trx0sys.cc')
| -rw-r--r-- | storage/innobase/trx/trx0sys.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/storage/innobase/trx/trx0sys.cc b/storage/innobase/trx/trx0sys.cc index b0b8ea4b740..0b2837a09b5 100644 --- a/storage/innobase/trx/trx0sys.cc +++ b/storage/innobase/trx/trx0sys.cc @@ -359,7 +359,6 @@ trx_sys_update_wsrep_checkpoint( ut_ad(xid && mtr); ut_a(xid->formatID == -1 || wsrep_is_wsrep_xid(xid)); - sys_header = trx_sysf_get(mtr); if (mach_read_from_4(sys_header + TRX_SYS_WSREP_XID_INFO + TRX_SYS_WSREP_XID_MAGIC_N_FLD) != TRX_SYS_WSREP_XID_MAGIC_N) { |