summaryrefslogtreecommitdiff
path: root/storage/pbxt
diff options
context:
space:
mode:
authorunknown <knielsen@knielsen-hq.org>2011-04-12 14:26:06 +0200
committerunknown <knielsen@knielsen-hq.org>2011-04-12 14:26:06 +0200
commitce55d37929fc91b476541d3a77336a44b20317ac (patch)
tree867bf056f51f0338af221431380445d7784b2c0e /storage/pbxt
parentfcd29b78456a47b00763fe249bbee9456bfbf6bb (diff)
parent3a3a91ff051abe859589e33fab4b5588e325d55b (diff)
downloadmariadb-git-ce55d37929fc91b476541d3a77336a44b20317ac.tar.gz
Merge Mariadb 5.1->5.2
Diffstat (limited to 'storage/pbxt')
-rw-r--r--storage/pbxt/src/lock_xt.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/storage/pbxt/src/lock_xt.cc b/storage/pbxt/src/lock_xt.cc
index 946adfecccc..5dbba9db83a 100644
--- a/storage/pbxt/src/lock_xt.cc
+++ b/storage/pbxt/src/lock_xt.cc
@@ -1424,6 +1424,7 @@ xtPublic void xt_spinxslock_init(struct XTThread *XT_UNUSED(self), XTSpinXSLockP
#endif
{
sxs->sxs_xlocked = 0;
+ sxs->sxs_xwaiter = 0;
sxs->sxs_rlock_count = 0;
sxs->sxs_wait_count = 0;
#ifdef DEBUG