bk commit into 5.1 tree (pekka:1.2416)

[pekka]

Below is the list of changes that have just been committed into a local
5.1 repository of pekka. When pekka 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-03-19 08:55:53+01:00, pekka@stripped +2 -0
  ndb -  wl#3600 alter table small cleanup

  storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp@stripped, 2007-03-19 08:55:10+01:00,
pekka@stripped +26 -38
    wl#3600 alter table small cleanup

  storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp@stripped, 2007-03-19 08:55:10+01:00,
pekka@stripped +1 -1
    wl#3600 alter table small cleanup

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	pekka
# Host:	clam.(none)
# Root:	/export/space/pekka/ndb/version/my52-wl3600-a

--- 1.158/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp	2007-03-16 13:53:52 +01:00
+++ 1.159/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp	2007-03-19 08:55:10 +01:00
@@ -8987,39 +8987,32 @@
 }
 
 void
-Dbdict::execDROP_TAB_REF(Signal* signal){
+Dbdict::execDROP_TAB_REF(Signal* signal)
+{
   jamEntry();
+  const DropTabRef* ref = (const DropTabRef*)signal->getDataPtr();
 
-  DropTabRef * const req = (DropTabRef*)signal->getDataPtr();
-
-  Uint32 block = refToBlock(req->senderRef);
-  ndbrequire(req->errorCode == DropTabRef::NF_FakeErrorREF ||
-	     (req->errorCode == DropTabRef::NoSuchTable &&
-	      (block == DBTUP || block == DBACC || block == DBLQH)));
+  Uint32 block = refToBlock(ref->senderRef);
+  ndbrequire(block != DBDICT);
+  ndbrequire(refToNode(ref->senderRef) == getOwnNodeId());
+  ndbrequire(ref->errorCode == DropTabRef::NoSuchTable);
   
-  if(block != DBDICT){
-    jam();
-    ndbrequire(refToNode(req->senderRef) == getOwnNodeId());
-    dropTab_localDROP_TAB_CONF(signal);
-    return;
-  }
-  ndbrequire(false);
+  dropTab_localDROP_TAB_CONF(signal, ref->senderData, ref->tableId);
 }
 
 void
 Dbdict::execDROP_TAB_CONF(Signal* signal)
 {
   jamEntry();
+  const DropTabConf* conf = (const DropTabConf*)signal->getDataPtr();
 
-  DropTabConf * const req = (DropTabConf*)signal->getDataPtr();
+  Uint32 block = refToBlock(conf->senderRef);
+  ndbrequire(block != DBDICT);
+  ndbrequire(refToNode(conf->senderRef) == getOwnNodeId());
 
-  if(refToBlock(req->senderRef) != DBDICT){
-    jam();
-    ndbrequire(refToNode(req->senderRef) == getOwnNodeId());
-    dropTab_localDROP_TAB_CONF(signal);
-    return;
-  }
+  dropTab_localDROP_TAB_CONF(signal, conf->senderData, conf->tableId);
 
+#if wl3600_todo //remove
   SchemaOpPtr op_ptr;
   DropTableDataPtr dropTabPtr;  
   findSchemaOp(op_ptr, dropTabPtr, req->senderData);
@@ -9031,7 +9024,6 @@
 
   schemaTrans_sendConf(signal, op_ptr.p->m_trans_ptr, 0);//itRepeat???
 
-#if wl3600_todo //remove
   Uint32 nodeId = refToNode(req->senderRef);
   dropTabPtr.p->m_coordinatorData.m_signalCounter.clearWaitingFor(nodeId);
   
@@ -9286,21 +9278,19 @@
 }
 
 void
-Dbdict::dropTab_localDROP_TAB_CONF(Signal* signal)
+Dbdict::dropTab_localDROP_TAB_CONF(Signal* signal, Uint32 op_key, Uint32 tableId)
 {
   jamEntry();
-  
-  DropTabConf * conf = (DropTabConf*)signal->getDataPtr();
 
   SchemaOpPtr op_ptr;
   DropTableDataPtr dropTabPtr;
-  findSchemaOp(op_ptr, dropTabPtr, conf->senderData);
+  findSchemaOp(op_ptr, dropTabPtr, op_key);
   ndbrequire(!op_ptr.isNull());
   const DropTabReq* impl_req = &dropTabPtr.p->m_request;
 
   D("dropTab_localDROP_TAB_CONF" << *op_ptr.p);
   
-  ndbrequire(dropTabPtr.p->m_request.tableId == conf->tableId);
+  ndbrequire(impl_req->tableId == tableId);
   ndbrequire(dropTabPtr.p->m_participantData.m_gsn == GSN_DROP_TAB_REQ);
 
   Uint32 requestType = DictSignal::getRequestType(impl_req->requestInfo);
@@ -9387,6 +9377,7 @@
   DropTableDataPtr dropTabPtr;  
   findSchemaOp(op_ptr, dropTabPtr, callbackData);
   ndbrequire(!op_ptr.isNull());
+  const DropTabReq* impl_req = &dropTabPtr.p->m_request;
   SchemaTransPtr trans_ptr = op_ptr.p->m_trans_ptr;
 
   ndbrequire(dropTabPtr.p->m_participantData.m_gsn == GSN_DROP_TAB_REQ);
@@ -9396,30 +9387,27 @@
   unlinkDictObject(op_ptr);
   releaseTableObject(dropTabPtr.p->m_request.tableId);
 
-  DropTabConf * conf = (DropTabConf*)signal->getDataPtr();  
-  conf->senderRef = reference();
-  conf->senderData = callbackData;
-  conf->tableId = dropTabPtr.p->m_request.tableId;
+  // inform SUMA
   {
-    // wl3600_todo - check this
-    DropTabConf tmp= *conf;
+    DropTabConf* conf = (DropTabConf*)signal->getDataPtrSend();
+
+    // special use of senderRef
     if (trans_ptr.p->m_isMaster) {
       jam();
-      //conf->senderRef = dropTabPtr.p->m_request.senderRef;
       conf->senderRef = trans_ptr.p->m_clientRef;
     } else {
       jam();
       conf->senderRef = 0;
     }
+    conf->senderData = callbackData;
+    conf->tableId = impl_req->tableId;
+
     EXECUTE_DIRECT(SUMA, GSN_DROP_TAB_CONF, signal,
 		   DropTabConf::SignalLength);
     jamEntry();
-    *conf= tmp;
   }
-  dropTabPtr.p->m_participantData.m_gsn = GSN_DROP_TAB_CONF;
 
-  sendSignal(reference(), GSN_DROP_TAB_CONF, signal, 
-	     DropTabConf::SignalLength, JBB);
+  schemaTrans_sendConf(signal, trans_ptr);
 
 #if wl3600_todo
   sendSignal(dropTabPtr.p->m_coordinatorRef, GSN_DROP_TAB_CONF, signal, 

--- 1.82/storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp	2007-03-16 13:53:52 +01:00
+++ 1.83/storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp	2007-03-19 08:55:10 +01:00
@@ -3256,7 +3256,7 @@
   void prepDropTab_complete(Signal* signal, SchemaOpPtr);
   void prepDropTab_writeSchemaConf(Signal* signal, Uint32 callbackData, Uint32);
 
-  void dropTab_localDROP_TAB_CONF(Signal* signal);
+  void dropTab_localDROP_TAB_CONF(Signal* signal, Uint32 op_key, Uint32 tableId);
   void dropTab_nextStep(Signal* signal, SchemaOpPtr);
   void dropTab_complete(Signal* signal, Uint32 callbackData, Uint32);
   void dropTab_writeSchemaConf(Signal* signal, Uint32 callbackData, Uint32);