bk commit into 5.1 tree (jonas:1.2046)

[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
  1.2046 05/10/12 11:10:11 jonas@stripped +4 -0
  Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1
  into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-ndb-dd

  storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
    1.112 05/10/12 11:10:09 jonas@stripped +1 -1
    merge

  storage/ndb/src/ndbapi/TransporterFacade.cpp
    1.39 05/10/12 11:08:09 jonas@stripped +0 -0
    Auto merged

  storage/ndb/src/mgmsrv/ConfigInfo.cpp
    1.70 05/10/12 11:08:09 jonas@stripped +0 -0
    Auto merged

  storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp
    1.47 05/10/12 11:08:09 jonas@stripped +0 -0
    Auto merged

# 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:	jonas
# Host:	perch.ndb.mysql.com
# Root:	/home/jonas/src/mysql-5.1-ndb-dd/RESYNC

--- 1.69/storage/ndb/src/mgmsrv/ConfigInfo.cpp	2005-10-10 14:35:20 +02:00
+++ 1.70/storage/ndb/src/mgmsrv/ConfigInfo.cpp	2005-10-12 11:08:09 +02:00
@@ -150,7 +150,6 @@
   { "TCP",  fixPortNumber, 0 }, // has to come after fixHostName
   { "SHM",  fixPortNumber, 0 }, // has to come after fixHostName
   { "SCI",  fixPortNumber, 0 }, // has to come after fixHostName
-  { "SHM",  fixShmKey, 0 },
 
   /**
    * fixExtConnection must be after fixNodeId
@@ -164,6 +163,8 @@
   { "*",    fixDepricated, 0 },
   { "*",    applyDefaultValues, "system" },
 
+  { "SHM",  fixShmKey, 0 }, // has to come after apply default values
+
   { DB_TOKEN,   checkLocalhostHostnameMix, 0 },
   { API_TOKEN,  checkLocalhostHostnameMix, 0 },
   { MGM_TOKEN,  checkLocalhostHostnameMix, 0 },
@@ -1798,7 +1799,7 @@
     ConfigInfo::CI_USED,
     false,
     ConfigInfo::CI_INT,
-    "0",
+    UNDEFINED,
     "0",
     STR_VALUE(MAX_INT_RNIL) },
   

--- 1.111/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp	2005-10-11 07:38:27 +02:00
+++ 1.112/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp	2005-10-12 11:10:09 +02:00
@@ -12933,7 +12933,8 @@
 */
 
 void
-Dbdict::getTableKeyList(TableRecordPtr tablePtr, AttributeList& list)
+Dbdict::getTableKeyList(TableRecordPtr tablePtr, 
+			Id_array<MAX_ATTRIBUTES_IN_INDEX+1>& list)
 {
   jam();
   list.sz = 0;
@@ -12947,6 +12948,7 @@
     }
   }
   ndbrequire(list.sz == tablePtr.p->noOfPrimkey + 1);
+  ndbrequire(list.sz <= MAX_ATTRIBUTES_IN_INDEX + 1);
 }
 
 // XXX should store the primary attribute id

--- 1.46/storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp	2005-10-10 14:31:35 +02:00
+++ 1.47/storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp	2005-10-12 11:08:09 +02:00
@@ -1451,7 +1451,7 @@
     // original request plus buffer for attribute lists
     BuildIndxReq m_request;
     AttributeList m_attrList;
-    AttributeList m_tableKeyList;
+    Id_array<MAX_ATTRIBUTES_IN_INDEX+1> m_tableKeyList;
     // coordinator DICT
     Uint32 m_coordinatorRef;
     bool m_isMaster;
@@ -2303,7 +2303,8 @@
   void alterTrigger_sendSlaveReq(Signal* signal, OpAlterTriggerPtr opPtr);
   void alterTrigger_sendReply(Signal* signal, OpAlterTriggerPtr opPtr, bool);
   // support
-  void getTableKeyList(TableRecordPtr tablePtr, AttributeList& list);
+  void getTableKeyList(TableRecordPtr, 
+		       Id_array<MAX_ATTRIBUTES_IN_INDEX+1>& list);
   void getIndexAttr(TableRecordPtr indexPtr, Uint32 itAttr, Uint32* id);
   void getIndexAttrList(TableRecordPtr indexPtr, AttributeList& list);
   void getIndexAttrMask(TableRecordPtr indexPtr, AttributeMask& mask);

--- 1.38/storage/ndb/src/ndbapi/TransporterFacade.cpp	2005-09-16 17:06:46 +02:00
+++ 1.39/storage/ndb/src/ndbapi/TransporterFacade.cpp	2005-10-12 11:08:09 +02:00
@@ -64,13 +64,16 @@
  *****************************************************************************/
 
 void
-reportError(void * callbackObj, NodeId nodeId, TransporterError errorCode){
+reportError(void * callbackObj, NodeId nodeId,
+	    TransporterError errorCode, const char *info)
+{
 #ifdef REPORT_TRANSPORTER
-  ndbout_c("REPORT_TRANSP: reportError (nodeId=%d, errorCode=%d)", 
-	   (int)nodeId, (int)errorCode);
+  ndbout_c("REPORT_TRANSP: reportError (nodeId=%d, errorCode=%d) %s", 
+	   (int)nodeId, (int)errorCode, info ? info : "");
 #endif
-  if(errorCode & 0x8000) {
-    ndbout_c("reportError (%d, %d)\n", (int)nodeId, (int)errorCode);
+  if(errorCode & TE_DO_DISCONNECT) {
+    ndbout_c("reportError (%d, %d) %s", (int)nodeId, (int)errorCode,
+	     info ? info : "");
     ((TransporterFacade*)(callbackObj))->doDisconnect(nodeId);
   }
 }