diff options
| author | Sergey Vojtovich <svoj@mariadb.org> | 2019-04-19 19:17:27 +0400 |
|---|---|---|
| committer | Sergey Vojtovich <svoj@mariadb.org> | 2019-04-25 15:06:40 +0400 |
| commit | b7fd7ce2863eab91d6a1f72b7473f936a729d94f (patch) | |
| tree | 29eaf614f6a3894fb6fdc314c61fcc58e2b702a3 /sql/wsrep_applier.cc | |
| parent | 228514e52f13661b195e4c450f33888842f04241 (diff) | |
| download | mariadb-git-b7fd7ce2863eab91d6a1f72b7473f936a729d94f.tar.gz | |
Moved normal transaction xid to implicit_xid
Part of MDEV-7974 - backport fix for mysql bug#12161 (XA and binlog)
Diffstat (limited to 'sql/wsrep_applier.cc')
| -rw-r--r-- | sql/wsrep_applier.cc | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/sql/wsrep_applier.cc b/sql/wsrep_applier.cc index 2c4dab3bd20..39cdef77be2 100644 --- a/sql/wsrep_applier.cc +++ b/sql/wsrep_applier.cc @@ -184,12 +184,6 @@ int wsrep_apply_events(THD* thd, thd->set_server_id(ev->server_id); thd->set_time(); // time the query thd->transaction.start_time.reset(thd); - //#define mariadb_10_4_0 -#ifdef mariadb_10_4_0 - wsrep_xid_init(&thd->transaction.xid_state.xid, - thd->wsrep_trx_meta.gtid.uuid, - thd->wsrep_trx_meta.gtid.seqno); -#endif thd->lex->current_select= 0; if (!ev->when) { |