summaryrefslogtreecommitdiff
path: root/sql/handler.h
diff options
context:
space:
mode:
authorSergey Vojtovich <svoj@mariadb.org>2015-03-12 18:15:08 +0400
committerSergey Vojtovich <svoj@mariadb.org>2015-03-12 18:15:08 +0400
commit20e5c37ccfac9d95a2db1f295f211656df1ce160 (patch)
tree6aa8d3fb3b4707857cdc0c9d05f1129b702c6291 /sql/handler.h
parent190858d996e7dc90e01fe8a5e7daec6af0012b23 (diff)
downloadmariadb-git-bb-mdev7728.tar.gz
MDEV-7728 - Spiral patch 032_mariadb-10.0.15.scale_registering_xid.diffbb-mdev7728
XID cache is now based on lock-free hash. Also fixed lf_hash_destroy() to call alloc destructor. Note that previous implementation had race condition when thread was accessing XA owned by different thread. This new implementation doesn't fix it either.
Diffstat (limited to 'sql/handler.h')
-rw-r--r--sql/handler.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/handler.h b/sql/handler.h
index 5ef92088df5..5ab67c045ec 100644
--- a/sql/handler.h
+++ b/sql/handler.h
@@ -612,11 +612,11 @@ struct xid_t {
return sizeof(formatID)+sizeof(gtrid_length)+sizeof(bqual_length)+
gtrid_length+bqual_length;
}
- uchar *key()
+ uchar *key() const
{
return (uchar *)&gtrid_length;
}
- uint key_length()
+ uint key_length() const
{
return sizeof(gtrid_length)+sizeof(bqual_length)+gtrid_length+bqual_length;
}