bk commit into 5.1 tree (jonas:1.2552) BUG#30764

[jonas]

Below is the list of changes that have just been committed into a local
5.1 repository of jonas. When jonas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-09-03 08:15:59+02:00, jonas@stripped +1 -0
  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@stripped, 2007-09-03 08:15:56+02:00, jonas@stripped +1 -0
    When adding a read to lock queue, where there is a X-lock ahead, upgrade to X-lock
    (found by pekkas blob changes)

diff -Nrup a/storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp b/storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
--- a/storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp	2007-05-17 08:57:00 +02:00
+++ b/storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp	2007-09-03 08:15:56 +02:00
@@ -2137,6 +2137,7 @@ Dbacc::placeReadInLockQueue(Operationrec
   if (same && (lastbits & Operationrec::OP_ACC_LOCK_MODE))
   {
     jam();
+    opbits |= Operationrec::OP_LOCK_MODE; // Upgrade to X-lock
     goto checkop;
   }