summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
authorunknown <jonas@perch.ndb.mysql.com>2007-09-03 08:15:59 +0200
committerunknown <jonas@perch.ndb.mysql.com>2007-09-03 08:15:59 +0200
commitfb4604f2e80f83735a2c9e4ab0947c27a2ff5055 (patch)
tree598a5341a0c985fec15adcdc730320320dece494 /storage
parent39a892aa3f2c1d8638bcb56c385105adc3cd5db1 (diff)
downloadmariadb-git-fb4604f2e80f83735a2c9e4ab0947c27a2ff5055.tar.gz
ndb - bug#30764
When adding a read to lock queue, where there is a X-lock ahead, upgrade to X-lock (found by pekkas blob changes) storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp: When adding a read to lock queue, where there is a X-lock ahead, upgrade to X-lock (found by pekkas blob changes)
Diffstat (limited to 'storage')
-rw-r--r--storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp b/storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
index 6a1ad48f8b7..63d22bd0a37 100644
--- a/storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
+++ b/storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
@@ -2137,6 +2137,7 @@ Dbacc::placeReadInLockQueue(OperationrecPtr lockOwnerPtr)
if (same && (lastbits & Operationrec::OP_ACC_LOCK_MODE))
{
jam();
+ opbits |= Operationrec::OP_LOCK_MODE; // Upgrade to X-lock
goto checkop;
}