database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Moved normal transaction xid to implicit_xid

Browse Source 
Part of MDEV-7974 - backport fix for mysql bug#12161 (XA and binlog)
This commit is contained in:
Sergey Vojtovich
2019-04-19 19:17:27 +04:00
parent 228514e52f
commit b7fd7ce286
7 changed files with 26 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_class.h
View File

@ -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));