bk commit into 5.1 tree (pekka:1.2419)

[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-25 13:04:25+02:00, pekka@clam.(none) +1 -0
  Merge clam.ndb.mysql.com:/export/space/pekka/ndb/version/my52-wl3600-main
  into  clam.ndb.mysql.com:/export/space/pekka/ndb/version/my52-wl3600-a
  MERGE: 1.2417.1.1

  storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp@stripped, 2007-03-25 13:04:18+02:00, pekka@clam.(none) +0 -0
    Auto merged
    MERGE: 1.160.1.1

# 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/RESYNC

--- 1.161/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp	2007-03-25 07:52:13 +02:00
+++ 1.162/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp	2007-03-25 13:04:18 +02:00
@@ -2721,6 +2721,7 @@
   BuildIndxReq* req = (BuildIndxReq*)signal->getDataPtrSend();
 
   Uint32 requestInfo = 0;
+  DictSignal::setRequestType(requestInfo, BuildIndxReq::MainOp);
   DictSignal::copyGlobalFlags(requestInfo, tx_ptr.p->m_requestInfo);
 
   req->clientRef = reference();
@@ -6842,9 +6843,6 @@
   AlterTableDataPtr alterTabPtr;
   getOpData(op_ptr, alterTabPtr);
   AlterTabReq* impl_req = &alterTabPtr.p->m_request;
-
-  ndbrequire(impl_req->senderRef == numberToRef(DBDICT, c_masterNodeId));
-  ndbrequire(impl_req->senderData == op_ptr.p->op_key);
   
   // check that all db nodes run same version
   if (!check_ndb_versions()) {
@@ -9988,9 +9986,6 @@
   getOpData(op_ptr, createIndexPtr);
   CreateIndxImplReq* impl_req = &createIndexPtr.p->m_request;
 
-  ndbrequire(impl_req->senderRef == numberToRef(DBDICT, c_masterNodeId));
-  ndbrequire(impl_req->senderData == op_ptr.p->op_key);
-
   // save attribute list
   AttributeList& attrList = createIndexPtr.p->m_attrList;
   {
@@ -10227,8 +10222,6 @@
 {
   D("createIndex_toCreateTable");
 
-  CreateTableReq* req = (CreateTableReq*)signal->getDataPtrSend();
-
   SchemaTransPtr trans_ptr = op_ptr.p->m_trans_ptr;
   CreateIndexDataPtr createIndexPtr;
   getOpData(op_ptr, createIndexPtr);
@@ -10354,17 +10347,22 @@
   // finish
   w.add(DictTabInfo::TableEnd, (Uint32)true);
 
-  // send signal
+  CreateTableReq* req = (CreateTableReq*)signal->getDataPtrSend();
+
+  Uint32 requestInfo = 0;
+  DictSignal::copyGlobalFlags(requestInfo, op_ptr.p->m_requestInfo);
+
   req->clientRef = reference();
   req->clientData = op_ptr.p->op_key;
   req->transId = trans_ptr.p->m_transId;
   req->transKey = trans_ptr.p->trans_key;
+  req->requestInfo = requestInfo;
 
   LinearSectionPtr lsPtr[3];
   lsPtr[0].p = wbuffer;
   lsPtr[0].sz = w.getWordsUsed();
-  sendSignal(reference(), GSN_CREATE_TABLE_REQ,
-      signal, CreateTableReq::SignalLength, JBB, lsPtr, 1);
+  sendSignal(reference(), GSN_CREATE_TABLE_REQ, signal,
+             CreateTableReq::SignalLength, JBB, lsPtr, 1);
 }
 
 void
@@ -10413,6 +10411,7 @@
 
   Uint32 requestInfo = 0;
   DictSignal::setRequestType(requestInfo, AlterIndxReq::AlterIndexOnline);
+  DictSignal::copyGlobalFlags(requestInfo, op_ptr.p->m_requestInfo);
 
   req->clientRef = reference();
   req->clientData = op_ptr.p->op_key;
@@ -10820,6 +10819,7 @@
 
   Uint32 requestInfo = 0;
   DictSignal::setRequestType(requestInfo, AlterIndxReq::AlterIndexOffline);
+  DictSignal::copyGlobalFlags(requestInfo, op_ptr.p->m_requestInfo);
 
   req->clientRef = reference();
   req->clientData = op_ptr.p->op_key;
@@ -10869,21 +10869,26 @@
 {
   D("dropIndex_toDropTable");
 
-  DropTableReq* req = (DropTableReq*)signal->getDataPtrSend();
-
   SchemaTransPtr trans_ptr = op_ptr.p->m_trans_ptr;
   DropIndexDataPtr dropIndexPtr;
   getOpData(op_ptr, dropIndexPtr);
+  const DropIndxImplReq* impl_req = &dropIndexPtr.p->m_request;
+
+  DropTableReq* req = (DropTableReq*)signal->getDataPtrSend();
+
+  Uint32 requestInfo = 0;
+  DictSignal::copyGlobalFlags(requestInfo, op_ptr.p->m_requestInfo);
 
   req->clientRef = reference();
   req->clientData = op_ptr.p->op_key;
   req->transId = trans_ptr.p->m_transId;
   req->transKey = trans_ptr.p->trans_key;
-  req->tableId = dropIndexPtr.p->m_request.indexId;
-  req->tableVersion = dropIndexPtr.p->m_request.indexVersion;
+  req->requestInfo = requestInfo;
+  req->tableId = impl_req->indexId;
+  req->tableVersion = impl_req->indexVersion;
 
-  sendSignal(reference(), GSN_DROP_TABLE_REQ,
-             signal, DropTableReq::SignalLength, JBB);
+  sendSignal(reference(), GSN_DROP_TABLE_REQ, signal,
+             DropTableReq::SignalLength, JBB);
 }
 
 void
@@ -13580,6 +13585,7 @@
 
   Uint32 requestInfo = 0;
   DictSignal::setRequestType(requestInfo, 0);
+  DictSignal::copyGlobalFlags(requestInfo, op_ptr.p->m_requestInfo);
   DictSignal::setFeedbackId(requestInfo, AlterIndex_atDropTrigger);
 
   req->clientRef = reference();
@@ -15522,9 +15528,6 @@
   getOpData(op_ptr, dropTriggerPtr);
   DropTrigImplReq* impl_req = &dropTriggerPtr.p->m_request;
 
-  ndbrequire(impl_req->senderRef == numberToRef(DBDICT, c_masterNodeId));
-  ndbrequire(impl_req->senderData == op_ptr.p->op_key);
-
   bool reqByName = false;
   if (signal->getNoOfSections() > 0) { // wl3600_todo use requestType
     jam();
@@ -15666,6 +15669,7 @@
 
   Uint32 requestInfo = 0;
   DictSignal::setRequestType(requestInfo, AlterTrigReq::AlterTriggerOffline);
+  DictSignal::copyGlobalFlags(requestInfo, op_ptr.p->m_requestInfo);
 
   req->clientRef = reference();
   req->clientData = op_ptr.p->op_key;