diff options
| author | Daniele Sciascia <daniele.sciascia@galeracluster.com> | 2020-10-15 09:24:01 +0200 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2020-10-20 14:19:21 +0300 |
| commit | c00857915c951056ab431b366fb236f66c0f515f (patch) | |
| tree | b8380b459490052c66627917fa1f043ec3deab33 /sql/handler.cc | |
| parent | 7eda55619654b76add275695e0a6039e60876e81 (diff) | |
| download | mariadb-git-bb-10.4-MDEV-23081.tar.gz | |
MDEV-23081 Stray XA transactions at startup, with wsrep_on=OFFbb-10.4-MDEV-23081
Change xarecover_handlerton so that transaction with WSREP prefixed
xids are rolled back when Galera is disabled.
Diffstat (limited to 'sql/handler.cc')
| -rw-r--r-- | sql/handler.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index 6dc17109ffd..845d288b780 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -2167,7 +2167,7 @@ static my_bool xarecover_handlerton(THD *unused, plugin_ref plugin, for (int i=0; i < got; i ++) { - my_xid x= IF_WSREP(WSREP_ON && wsrep_is_wsrep_xid(&info->list[i]) ? + my_xid x= IF_WSREP(wsrep_is_wsrep_xid(&info->list[i]) ? wsrep_xid_seqno(&info->list[i]) : info->list[i].get_my_xid(), info->list[i].get_my_xid()); |