summaryrefslogtreecommitdiff
path: root/sql/wsrep_binlog.cc
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2019-10-28 16:16:21 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2019-10-28 16:16:21 +0200
commit8f46e3833c7acb3ec3e4c7b389ae8cdd98eff1ce (patch)
tree2eb0366d0c8309478a3d6de5a93b030aa76e8e3d /sql/wsrep_binlog.cc
parent9afbb1069ab4178741b76adefacd3f6a0ed51369 (diff)
downloadmariadb-git-8f46e3833c7acb3ec3e4c7b389ae8cdd98eff1ce.tar.gz
Revert MDEV-17099 Preliminary changes for Galera XA support (#1401)
This reverts commit 2b5f4b3ed68585b310b7ebede474928ff90d9aa2 due to build failures.
Diffstat (limited to 'sql/wsrep_binlog.cc')
-rw-r--r--sql/wsrep_binlog.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/wsrep_binlog.cc b/sql/wsrep_binlog.cc
index 84fce7c2b2d..ecab4664d7b 100644
--- a/sql/wsrep_binlog.cc
+++ b/sql/wsrep_binlog.cc
@@ -123,7 +123,7 @@ static int wsrep_write_cache_inc(THD* const thd,
DBUG_ENTER("wsrep_write_cache_inc");
my_off_t const saved_pos(my_b_tell(cache));
- if (reinit_io_cache(cache, READ_CACHE, thd->wsrep_sr().log_position(), 0, 0))
+ if (reinit_io_cache(cache, READ_CACHE, thd->wsrep_sr().bytes_certified(), 0, 0))
{
WSREP_ERROR("failed to initialize io-cache");
DBUG_RETURN(1);;
@@ -158,7 +158,7 @@ static int wsrep_write_cache_inc(THD* const thd,
}
if (ret == 0)
{
- assert(total_length + thd->wsrep_sr().log_position() == saved_pos);
+ assert(total_length + thd->wsrep_sr().bytes_certified() == saved_pos);
}
cleanup: