bk commit into 5.1 tree (joreland:1.1906)

[jonas.oreland]

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.1906 05/06/13 08:58:20 joreland@stripped +2 -0
  merge

  storage/ndb/src/ndbapi/Ndb.cpp
    1.45 05/06/13 08:58:16 joreland@stripped +3 -3
    merge

  storage/ndb/src/kernel/blocks/dbtup/DbtupBuffer.cpp
    1.12 05/06/13 08:58:16 joreland@stripped +3 -1
    merge

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

--- 1.11/storage/ndb/src/kernel/blocks/dbtup/DbtupBuffer.cpp	Mon Jun 13 08:29:45 2005
+++ 1.12/storage/ndb/src/kernel/blocks/dbtup/DbtupBuffer.cpp	Mon Jun 13 08:58:16 2005
@@ -144,7 +144,9 @@
   const Uint32 type= getNodeInfo(nodeId).m_type;
   bool is_api= (type >= NodeInfo::API && type <= NodeInfo::REP);
   bool old_dest= (getNodeInfo(nodeId).m_version < MAKE_VERSION(3,5,0));
-  
+  Uint32 TpacketLen= hostBuffer[nodeId].packetLenTA;
+  Uint32 TpacketTA= hostBuffer[nodeId].noOfPacketsTA;
+
   if (ERROR_INSERTED(4006) && (nodeId != getOwnNodeId())){
     // Use error insert to turn routing on
     ljam();

--- 1.44/storage/ndb/src/ndbapi/Ndb.cpp	Mon Jun 13 08:29:45 2005
+++ 1.45/storage/ndb/src/ndbapi/Ndb.cpp	Mon Jun 13 08:58:16 2005
@@ -865,7 +865,7 @@
     DBUG_RETURN(false);
   }
   const NdbTableImpl* table= info->m_table_impl;
-  DEBUG_RETURN(setTupleIdInNdb(table->m_id, val, increase));
+  DBUG_RETURN(setTupleIdInNdb(table->m_id, val, increase));
 }
 
 bool
@@ -1184,7 +1184,7 @@
   BaseString ret;
   DBUG_ENTER("internalize_index_name");
   DBUG_PRINT("enter", ("external_name: %s, table_id: %d",
-                       external_name, table ? table->m_tableId : ~0));
+                       external_name, table ? table->m_id : ~0));
   if (!table)
   {
     DBUG_PRINT("error", ("!table"));
@@ -1196,7 +1196,7 @@
     /* Internal index name format <db>/<schema>/<tabid>/<table>
*/
     ret.assfmt("%s%d%c%s",
                theImpl->m_prefix.c_str(),
-               table->m_tableId,
+               table->m_id,
                table_name_separator,
                external_name);
   }