mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-14 19:07:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge 10.4 into 10.5

Browse source
This commit is contained in:
Marko Mäkelä 2020-08-26 12:02:07 +03:00
commit 97a4a3872e
36 changed files with 504 additions and 232 deletions
Download patch file Download diff file Expand all files Collapse all files

8
sql/wsrep_trans_observer.h
View file

@ -136,9 +136,11 @@ static inline size_t wsrep_fragments_certified_for_stmt(THD* thd)
static inline int wsrep_start_transaction(THD* thd, wsrep_trx_id_t trx_id)
{
return (thd->wsrep_cs().state() != wsrep::client_state::s_none ?
thd->wsrep_cs().start_transaction(wsrep::transaction_id(trx_id)) :
0);
if (thd->wsrep_cs().state() != wsrep::client_state::s_none) {
if (wsrep_is_active(thd) == false)
return thd->wsrep_cs().start_transaction(wsrep::transaction_id(trx_id));
}
return 0;
}
/**/