bk commit into 5.1 tree (tomas:1.2352)

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas 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.2352 06/04/25 16:19:57 tomas@stripped +1 -0
  Merge jonas@perch:src/51-work/
  into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new

  storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp
    1.127 06/04/25 16:19:45 tomas@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:	tomas
# Host:	poseidon.ndb.mysql.com
# Root:	/home/tomas/mysql-5.1-new/RESYNC

--- 1.126/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp	2006-04-21 14:15:50 +02:00
+++ 1.127/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp	2006-04-25 16:19:45 +02:00
@@ -2112,15 +2112,15 @@
 
   if(tableDesc->ReplicaDataLen > 0)
   {
-    Uint16 replicaCount = tableDesc->ReplicaData[0];
-    Uint16 fragCount = tableDesc->ReplicaData[1];
+    Uint16 replicaCount = ntohs(tableDesc->ReplicaData[0]);
+    Uint16 fragCount = ntohs(tableDesc->ReplicaData[1]);
 
     impl->m_replicaCount = replicaCount;
     impl->m_fragmentCount = fragCount;
     DBUG_PRINT("info", ("replicaCount=%x , fragCount=%x",replicaCount,fragCount));
     for(i = 0; i < (Uint32) (fragCount*replicaCount); i++)
     {
-      impl->m_fragments.push_back(tableDesc->ReplicaData[i+2]);
+      impl->m_fragments.push_back(ntohs(tableDesc->ReplicaData[i+2]));
     }
 
     Uint32 topBit = (1 << 31);