summaryrefslogtreecommitdiff
path: root/sql/ha_innodb.cc
diff options
context:
space:
mode:
authorunknown <serg@sergbook.mysql.com>2005-08-12 21:15:01 +0200
committerunknown <serg@sergbook.mysql.com>2005-08-12 21:15:01 +0200
commit87ae5a15976ef3db7a85ac018d0aae17f16fd09d (patch)
tree7bf5242134e413730acf82415d7616fa6b277323 /sql/ha_innodb.cc
parente10362b47275e971a73f6a66a76a4bc24f237f42 (diff)
downloadmariadb-git-87ae5a15976ef3db7a85ac018d0aae17f16fd09d.tar.gz
BUG#12162 - one can start two transactions with the same XID.
Now we keep all active XID's in a hash
Diffstat (limited to 'sql/ha_innodb.cc')
-rw-r--r--sql/ha_innodb.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc
index 8dd45c03350..4aeeb954e17 100644
--- a/sql/ha_innodb.cc
+++ b/sql/ha_innodb.cc
@@ -7037,7 +7037,7 @@ innobase_xa_prepare(
return(0);
}
- trx->xid=thd->transaction.xid;
+ trx->xid=thd->transaction.xid_state.xid;
/* Release a possible FIFO ticket and search latch. Since we will
reserve the kernel mutex, we have to release the search system latch