summaryrefslogtreecommitdiff
path: root/sql/log.cc
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2020-04-27 14:24:41 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2020-04-27 14:24:41 +0300
commit2e12d471eab9db77473ec80637f8d0d2d03bf69f (patch)
treeeea2f8df98e8ccbd28d59b75706f44330fd4407d /sql/log.cc
parent61c0df94655f2dc3146456e49f3f51610251e79f (diff)
parentc06845d6f04e092b64c105eb6786056cea2ab593 (diff)
downloadmariadb-git-2e12d471eab9db77473ec80637f8d0d2d03bf69f.tar.gz
Merge 10.2 into 10.3
Diffstat (limited to 'sql/log.cc')
-rw-r--r--sql/log.cc9
1 files changed, 5 insertions, 4 deletions
diff --git a/sql/log.cc b/sql/log.cc
index ae7468ede81..abf396fc511 100644
--- a/sql/log.cc
+++ b/sql/log.cc
@@ -1818,7 +1818,7 @@ binlog_commit_flush_stmt_cache(THD *thd, bool all,
#ifdef WITH_WSREP
if (thd->wsrep_mysql_replicated > 0)
{
- DBUG_ASSERT(WSREP_ON);
+ DBUG_ASSERT(WSREP(thd));
WSREP_DEBUG("avoiding binlog_commit_flush_trx_cache: %d",
thd->wsrep_mysql_replicated);
return 0;
@@ -6680,14 +6680,15 @@ int MYSQL_BIN_LOG::rotate(bool force_rotate, bool* check_purge)
int error= 0;
DBUG_ENTER("MYSQL_BIN_LOG::rotate");
- if (wsrep_to_isolation)
+#ifdef WITH_WSREP
+ if (WSREP_ON && wsrep_to_isolation)
{
- DBUG_ASSERT(WSREP_ON);
*check_purge= false;
- WSREP_DEBUG("avoiding binlog rotate due to TO isolation: %d",
+ WSREP_DEBUG("avoiding binlog rotate due to TO isolation: %d",
wsrep_to_isolation);
DBUG_RETURN(0);
}
+#endif /* WITH_WSREP */
//todo: fix the macro def and restore safe_mutex_assert_owner(&LOCK_log);
*check_purge= false;