diff options
| author | Sergey Vojtovich <svoj@mariadb.org> | 2019-04-18 15:36:06 +0400 |
|---|---|---|
| committer | Sergey Vojtovich <svoj@mariadb.org> | 2019-04-25 15:06:40 +0400 |
| commit | 210855ce5d6803f41d672d75be3334726f52a9df (patch) | |
| tree | 0a9660f5c97118f4a4813ba7aa53f0833cd6cb94 /sql/xa.h | |
| parent | b7fd7ce2863eab91d6a1f72b7473f936a729d94f (diff) | |
| download | mariadb-git-210855ce5d6803f41d672d75be3334726f52a9df.tar.gz | |
Move XID_STATE::xid to XID_cache_element
Part of MDEV-7974 - backport fix for mysql bug#12161 (XA and binlog)
Diffstat (limited to 'sql/xa.h')
| -rw-r--r-- | sql/xa.h | 4 |
1 files changed, 1 insertions, 3 deletions
@@ -20,8 +20,6 @@ class XID_cache_element; struct XID_STATE { - /* For now, this is only used to catch duplicated external xids */ - XID xid; // transaction identifier XID_cache_element *xid_cache_element; bool check_has_uncommitted_xa() const; @@ -34,7 +32,7 @@ struct XID_STATE { void xid_cache_init(void); void xid_cache_free(void); bool xid_cache_insert(XID *xid); -bool xid_cache_insert(THD *thd, XID_STATE *xid_state); +bool xid_cache_insert(THD *thd, XID_STATE *xid_state, XID *xid); void xid_cache_delete(THD *thd, XID_STATE *xid_state); bool trans_xa_start(THD *thd); |