From ec79f377186adf7a233608e7f30364c4007a981a Mon Sep 17 00:00:00 2001
From: Andrei <andrei.elkin@mariadb.com>
Date: Wed, 3 May 2023 10:32:29 +0300
Subject: 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
---
 sql/log_event.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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);
     /*
-- 
cgit v1.2.1