Commit 25cfd325 authored by unknown's avatar unknown
Browse files

Merge perch.ndb.mysql.com:/home/jonas/src/51-work 

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
parents e86b5625 eff21a02

storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp

+1 −1
Original line number Diff line number Diff line
@@ -479,7 +479,7 @@ Dbdict::packTableIntoPages(SimpleProperties::Writer & w, 
		   CreateFragmentationReq::SignalLength);

    ndbrequire(signal->theData[0] == 0);

    Uint16 *data = (Uint16*)&signal->theData[25];

    Uint32 count = 2 + data[0] * data[1];

    Uint32 count = 2 + (1 + data[0]) * data[1];

    w.add(DictTabInfo::ReplicaDataLen, 2*count);

    for (Uint32 i = 0; i < count; i++)

      data[i] = htons(data[i]);

storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp

+1 −1
Original line number Diff line number Diff line
@@ -6728,7 +6728,7 @@ void Dbdih::execCREATE_FRAGMENTATION_REQ(Signal * signal) 
        FragmentstorePtr fragPtr;

        ReplicaRecordPtr replicaPtr;

        getFragstore(primTabPtr.p, fragNo, fragPtr);

	fragments[count++] = c_nextLogPart++;

	fragments[count++] = fragPtr.p->m_log_part_id;

        fragments[count++] = fragPtr.p->preferredPrimary;

        for (replicaPtr.i = fragPtr.p->storedReplicas;

             replicaPtr.i != RNIL;

storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp

+7 −2
Original line number Diff line number Diff line
@@ -2191,9 +2191,14 @@ NdbDictInterface::parseTableInfo(NdbTableImpl ** ret, 
    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++)

    Uint32 pos = 2;

    for(i = 0; i < (Uint32) fragCount;i++)

    {

      impl->m_fragments.push_back(ntohs(tableDesc->ReplicaData[i+2]));

      pos++; // skip logpart

      for (Uint32 j = 0; j<(Uint32)replicaCount; j++)

      {

	impl->m_fragments.push_back(ntohs(tableDesc->ReplicaData[pos++]));

      }

    }



    Uint32 topBit = (1 << 31);