diff options
author | Andrei <andrei.elkin@mariadb.com> | 2023-05-03 10:32:29 +0300 |
---|---|---|
committer | Andrei <andrei.elkin@mariadb.com> | 2023-05-03 10:32:29 +0300 |
commit | ec79f377186adf7a233608e7f30364c4007a981a (patch) | |
tree | ddb881be766c96d6c4ceb250d3e3115eee54b189 | |
parent | 430b972702542f128c1b50aea02e8e810f98048c (diff) | |
download | mariadb-git-ec79f377186adf7a233608e7f30364c4007a981a.tar.gz |
MDEV-29621 part 2 of post-merge fixes in galera
(part 1 is in the previous commit)
to [ pass ] galera.MDEV-18832, galera.MDEV-27862
-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 42d15ea1810..bafcf34cc2e 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -13786,7 +13786,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); /* |