MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:jonas Date:February 20 2008 9:56am
Subject:bk commit into 5.1 tree (jonas:1.2533)
View as plain text  
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, 2008-02-20 10:56:06+01:00, jonas@stripped +1 -0
  remove "#if 0":ed code added during merge

  storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp@stripped, 2008-02-20 10:56:03+01:00, jonas@stripped +0 -73
    remove "#if 0":ed code added during merge

diff -Nrup a/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp b/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
--- a/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp	2008-02-20 10:04:24 +01:00
+++ b/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp	2008-02-20 10:56:03 +01:00
@@ -10384,68 +10384,6 @@ void Dbdict::createEvent_sendReply(Signa
  *
  *******************************************************************/
 
-#if 0
-void
-Dbdict::execDICT_LOCK_REQ(Signal* signal)
-{
-  jamEntry();
-  DictLockReq req = *(DictLockReq*)signal->getDataPtr();
-
-  Uint32 err = 0;
-  do {
-    if (c_masterNodeId != getOwnNodeId())
-    {
-      jam();
-      err = DictLockRef::NotMaster;
-      break;
-    }
-
-    if (req.lockType != DictLockReq::SumaStartMe)
-    {
-      jam();
-      err = DictLockRef::InvalidLockType;
-      break;
-    }
-
-    if (c_outstanding_sub_startstop)
-    {
-      jam();
-      g_eventLogger.info("refing dict lock to %u", refToNode(req.userRef));
-      err = DictLockRef::TooManyRequests;
-      break;
-    }
-
-    c_sub_startstop_lock.set(refToNode(req.userRef));
-
-    g_eventLogger.info("granting dict lock to %u", refToNode(req.userRef));
-    DictLockConf* conf = (DictLockConf*)signal->getDataPtrSend();
-    conf->userPtr = req.userPtr;
-    conf->lockType = req.lockType;
-    conf->lockPtr = 0;
-    sendSignal(req.userRef, GSN_DICT_LOCK_CONF, signal,
-               DictLockConf::SignalLength, JBB);
-    return;
-  } while(0);
-
-  DictLockRef* ref = (DictLockRef*)signal->getDataPtrSend();
-  ref->userPtr = req.userPtr;
-  ref->lockType = req.lockType;
-  ref->errorCode = err;
-  sendSignal(req.userRef, GSN_DICT_LOCK_REF, signal,
-             DictLockRef::SignalLength, JBB);
-}
-
-void
-Dbdict::execDICT_UNLOCK_ORD(Signal* signal)
-{
-  jamEntry();
-  DictUnlockOrd ord = *(DictUnlockOrd*)signal->getDataPtr();
-
-  g_eventLogger.info("clearing dict lock for %u", refToNode(ord.senderRef));
-  c_sub_startstop_lock.clear(refToNode(ord.senderRef));
-}
-#endif
-
 void Dbdict::execSUB_START_REQ(Signal* signal)
 {
   jamEntry();
@@ -10469,17 +10407,6 @@ void Dbdict::execSUB_START_REQ(Signal* s
   OpSubEventPtr subbPtr;
   Uint32 errCode = 0;
 
-
-#if XXX_JONAS
-  DictLockPtr loopPtr;
-  if (c_dictLockQueue.first(loopPtr) &&
-      loopPtr.p->lt->lockType == DictLockReq::NodeRestartLock)
-  {
-    jam();
-    errCode = SubStartRef::BusyWithNR;
-    goto busy;
-  }
-#endif
 
   if (!c_opSubEvent.seize(subbPtr)) {
     errCode = SubStartRef::Busy;
Thread
bk commit into 5.1 tree (jonas:1.2533)jonas20 Feb