1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-7962: Remove one more wsrep_on()

Browse Source 
trx_rollback_to_savepoint(): Invoke trx_t::is_wsrep().
This commit is contained in:
Marko Mäkelä 2020-04-29 14:54:36 +03:00
parent cfbbf5424b
commit 5ba2aa1ddc
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
storage/innobase/trx/trx0roll.cc
View File

@ -178,8 +178,7 @@ trx_rollback_to_savepoint(
complete rollback */ complete rollback */
{ {
#ifdef WITH_WSREP #ifdef WITH_WSREP
if (savept == NULL && wsrep_on(trx->mysql_thd) if (!savept && trx->is_wsrep() && wsrep_thd_is_SR(trx->mysql_thd)) {
&& wsrep_thd_is_SR(trx->mysql_thd)) {
wsrep_handle_SR_rollback(NULL, trx->mysql_thd); wsrep_handle_SR_rollback(NULL, trx->mysql_thd);
} }
#endif /* WITH_WSREP */ #endif /* WITH_WSREP */