summaryrefslogtreecommitdiff
path: root/sql/xa.cc
diff options
context:
space:
mode:
authorSergey Vojtovich <svoj@mariadb.org>2019-04-19 19:17:27 +0400
committerSergey Vojtovich <svoj@mariadb.org>2019-04-25 15:06:40 +0400
commitb7fd7ce2863eab91d6a1f72b7473f936a729d94f (patch)
tree29eaf614f6a3894fb6fdc314c61fcc58e2b702a3 /sql/xa.cc
parent228514e52f13661b195e4c450f33888842f04241 (diff)
downloadmariadb-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/xa.cc')
-rw-r--r--sql/xa.cc7
1 files changed, 7 insertions, 0 deletions
diff --git a/sql/xa.cc b/sql/xa.cc
index 5accd01d600..0214059b401 100644
--- a/sql/xa.cc
+++ b/sql/xa.cc
@@ -188,6 +188,13 @@ bool XID_STATE::check_has_uncommitted_xa() const
}
+XID *XID_STATE::get_xid() const
+{
+ DBUG_ASSERT(is_explicit_XA());
+ return const_cast<XID*>(&xid);
+}
+
+
void xid_cache_init()
{
xid_cache_inited= true;