diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-04-27 17:38:17 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-04-27 17:38:17 +0300 |
| commit | b63446984c2c8441c19fc646f6652a9bc3076304 (patch) | |
| tree | a874d841721ba5d80f66e92e5e16dc0ab4233e2a /sql/log_event.cc | |
| parent | 6dab094fbd31ef93a1d51b1b9c867188b2f958c3 (diff) | |
| parent | 3568fad5c935426a275900e8130657b18ba14e9f (diff) | |
| download | mariadb-git-b63446984c2c8441c19fc646f6652a9bc3076304.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/log_event.cc')
| -rw-r--r-- | sql/log_event.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc index 269dd335644..1a77397bf79 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -9080,7 +9080,7 @@ Xid_log_event::do_shall_skip(rpl_group_info *rgi) DBUG_RETURN(Log_event::EVENT_SKIP_COUNT); } #ifdef WITH_WSREP - else if (wsrep_mysql_replication_bundle && WSREP(thd) && + else if (WSREP(thd) && wsrep_mysql_replication_bundle && opt_slave_domain_parallel_threads == 0) { if (++thd->wsrep_mysql_replicated < (int)wsrep_mysql_replication_bundle) |