diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2023-05-03 07:45:15 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2023-05-03 07:45:15 +0200 |
| commit | 430b972702542f128c1b50aea02e8e810f98048c (patch) | |
| tree | c6775485f8bb8258ee402a032179efbc1ba996b0 | |
| parent | 5597562aa6f411121e89e033e12fa662c509360d (diff) | |
| download | mariadb-git-430b972702542f128c1b50aea02e8e810f98048c.tar.gz | |
Protect a new condition (by Andrei)
| -rw-r--r-- | sql/log_event.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc index db682bd0835..42d15ea1810 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -13766,7 +13766,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)))) |