diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2023-05-03 09:46:49 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2023-05-03 09:46:49 +0200 |
| commit | 69932b6e68382a3ea639c4f0848b14a5327ab603 (patch) | |
| tree | f5655c53474584b7c9425ded0dc50102c660f4c1 | |
| parent | 8c793eaaf44ba3aea7f07986b908367ece3d247f (diff) | |
| parent | ec79f377186adf7a233608e7f30364c4007a981a (diff) | |
| download | mariadb-git-69932b6e68382a3ea639c4f0848b14a5327ab603.tar.gz | |
Merge branch '10.4' into 10.5
| -rw-r--r-- | sql/log_event_server.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sql/log_event_server.cc b/sql/log_event_server.cc index b93c892dc02..31075d9b64b 100644 --- a/sql/log_event_server.cc +++ b/sql/log_event_server.cc @@ -7497,7 +7497,11 @@ int Rows_log_event::update_sequence() int err= 0; if (!bitmap_is_set(table->rpl_write_set, MIN_VALUE_FIELD_NO) || - (!(table->in_use->rgi_slave->gtid_ev_flags2 & Gtid_log_event::FL_DDL) && + ( +#if defined(WITH_WSREP) + ! WSREP(thd) && +#endif + !(table->in_use->rgi_slave->gtid_ev_flags2 & Gtid_log_event::FL_DDL) && !(old_master= rpl_master_has_bug(thd->rgi_slave->rli, 29621, FALSE, FALSE, FALSE, TRUE)))) @@ -7513,7 +7517,7 @@ int Rows_log_event::update_sequence() return table->s->sequence->set_value(table, nextval, round, 0) > 0; } - if (thd->rgi_slave->is_parallel_exec && old_master) + if (old_master && !WSREP(thd) && thd->rgi_slave->is_parallel_exec) { DBUG_ASSERT(thd->rgi_slave->parallel_entry); /* |