From 8782227eb1295217d9951cd71873efd400a1d4fb Mon Sep 17 00:00:00 2001 From: Andrei Elkin Date: Thu, 4 Dec 2025 19:26:40 +0200 Subject: [PATCH] Revert "MDEV-37686 rpl.create_or_replace_mix2 fails in MDEV-35915 branch" This reverts commit 3241798214b066d62ba3274ba5dc29549349ca65. Due to MDEV-38212. --- sql/sql_class.cc | 3 --- sql/sql_class.h | 5 ----- 2 files changed, 8 deletions(-) diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 0278a44723c..e2df96f9f80 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -6678,8 +6678,6 @@ start_new_trans::start_new_trans(THD *thd) thd->server_status&= ~(SERVER_STATUS_IN_TRANS | SERVER_STATUS_IN_TRANS_READONLY); thd->server_status|= SERVER_STATUS_AUTOCOMMIT; - org_rgi_slave= thd->rgi_slave; - thd->rgi_slave= NULL; } @@ -6696,7 +6694,6 @@ void start_new_trans::restore_old_transaction() MYSQL_COMMIT_TRANSACTION(org_thd->m_transaction_psi); org_thd->m_transaction_psi= m_transaction_psi; org_thd->variables.wsrep_on= wsrep_on; - org_thd->rgi_slave= org_rgi_slave; org_thd= 0; } diff --git a/sql/sql_class.h b/sql/sql_class.h index cc56151cde3..6ee99793978 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -6314,11 +6314,6 @@ class start_new_trans uint in_sub_stmt; uint server_status; my_bool wsrep_on; - /* - THD:rgi_slave may hold a part of the replicated "old" transaction's - execution context. Therefore it has to be reset/restored too. - */ - rpl_group_info* org_rgi_slave; public: start_new_trans(THD *thd);