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/sql_class.h | |
| 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/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index 9a63ba60865..32165aed223 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -2582,6 +2582,7 @@ public: THD_TRANS stmt; // Trans for current statement bool on; // see ha_enable_transaction() XID_STATE xid_state; + XID implicit_xid; WT_THD wt; ///< for deadlock detection Rows_log_event *m_pending_rows_event; @@ -2606,9 +2607,7 @@ public: DBUG_ENTER("THD::st_transactions::cleanup"); changed_tables= 0; savepoints= 0; - /* xid_cache_delete() resets xid of explicitly started XA transaction */ - if (!xid_state.is_explicit_XA()) - xid_state.xid.null(); + implicit_xid.null(); free_root(&mem_root,MYF(MY_KEEP_PREALLOC)); DBUG_VOID_RETURN; } @@ -2620,6 +2619,7 @@ public: { bzero((char*)this, sizeof(*this)); xid_state.xid.null(); + implicit_xid.null(); init_sql_alloc(&mem_root, "THD::transactions", ALLOC_ROOT_MIN_BLOCK_SIZE, 0, MYF(MY_THREAD_SPECIFIC)); |