summaryrefslogtreecommitdiff
path: root/sql/xa.h
diff options
context:
space:
mode:
authorSergey Vojtovich <svoj@mariadb.org>2019-04-18 16:30:10 +0400
committerSergey Vojtovich <svoj@mariadb.org>2019-04-25 15:06:40 +0400
commit228514e52f13661b195e4c450f33888842f04241 (patch)
tree9801429abed865968925a0a96cb9a47b00545242 /sql/xa.h
parenta168cfb39698d98a9906160a8f60b9522372c5e9 (diff)
downloadmariadb-git-228514e52f13661b195e4c450f33888842f04241.tar.gz
Move XID_STATE::xa_state to XID_cache_element
Simplified away XA_NOTR, use XID_STATE::is_explicit_XA() instead. Part of MDEV-7974 - backport fix for mysql bug#12161 (XA and binlog)
Diffstat (limited to 'sql/xa.h')
-rw-r--r--sql/xa.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/xa.h b/sql/xa.h
index efe7db4b950..3473a9d862e 100644
--- a/sql/xa.h
+++ b/sql/xa.h
@@ -17,13 +17,11 @@
*/
-enum xa_states {XA_NOTR=0, XA_ACTIVE, XA_IDLE, XA_PREPARED, XA_ROLLBACK_ONLY};
class XID_cache_element;
struct XID_STATE {
/* For now, this is only used to catch duplicated external xids */
XID xid; // transaction identifier
- enum xa_states xa_state; // used by external XA only
XID_cache_element *xid_cache_element;
bool check_has_uncommitted_xa() const;