Mirrors/MariaDB-server
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-28 00:01:00 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Revert "MDEV-37686 rpl.create_or_replace_mix2 fails in MDEV-35915 branch"

Browse Source 
This reverts commit 3241798214.
Due to MDEV-38212.
This commit is contained in:
Andrei Elkin 2025-12-04 19:26:40 +02:00
parent 3a08a8e3d2
commit 8782227eb1
2 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_class.cc
View File

@ -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;
}

5
sql/sql_class.h
View File

@ -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);