Commit da70a12c authored by unknown's avatar unknown
Browse files

Bug #19852 Restoring backup made from cluster with full data memory fails 

- post merge fixes for 5.1
parent 89dbf165

storage/ndb/include/kernel/signaldata/DictTabInfo.hpp

+0 −2
Original line number Diff line number Diff line
@@ -315,8 +315,6 @@ public: 
    Uint32 CustomTriggerId;

    Uint32 TablespaceId;

    Uint32 TablespaceVersion;

    Uint32 MaxRowsLow;

    Uint32 MaxRowsHigh;

    Uint32 DefaultNoPartFlag;

    Uint32 LinearHashFlag;

    /*

storage/ndb/include/kernel/signaldata/LqhFrag.hpp

+2 −2
Original line number Diff line number Diff line
@@ -123,9 +123,9 @@ private: 
  Uint32 kValue;

  Uint32 schemaVersion;

  Uint32 nextLCP;

  Uint16 noOfNewAttr;

  Uint16 noOfCharsets;

  Uint32 noOfCharsets;

  Uint32 startGci;

  Uint32 tableType;             // DictTabInfo::TableType

  Uint32 primaryTableId;        // table of index or RNIL

  Uint32 tablespace_id;       // RNIL for MM table

  Uint16 tableId;

storage/ndb/include/kernel/signaldata/TupFrag.hpp

+2 −4
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ class TupFragReq { 
  friend class Dblqh;

  friend class Dbtup;

public:

  STATIC_CONST( SignalLength = 18 );

  STATIC_CONST( SignalLength = 17 );

private:

  Uint32 userPtr;

  Uint32 userRef;
@@ -45,10 +45,8 @@ private: 
  Uint32 noOfNullAttr;

  Uint32 schemaVersion;

  Uint32 noOfKeyAttr;

  Uint16 noOfNewAttr;

  Uint16 noOfCharsets;

  Uint32 noOfCharsets;

  Uint32 checksumIndicator;

  Uint32 noOfAttributeGroups;

  Uint32 globalCheckpointIdIndicator;

  Uint32 tablespaceid;

};

storage/ndb/include/ndbapi/NdbDictionary.hpp

+0 −7
Original line number Diff line number Diff line
@@ -830,13 +830,6 @@ public: 
     */

    virtual int getObjectVersion() const;



    /**

     * Set/Get Maximum number of rows in table (only used to calculate

     * number of partitions).

     */

    void setMaxRows(Uint64 maxRows);

    Uint64 getMaxRows() const;



    /**

     * Set/Get indicator if default number of partitions is used in table.

     */

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

+2 −3
Original line number Diff line number Diff line
@@ -5362,7 +5362,6 @@ Dbdict::execADD_FRAGREQ(Signal* signal) { 
    req->nextLCP = lcpNo;



    req->noOfKeyAttr = tabPtr.p->noOfPrimkey;

    req->noOfNewAttr = 0;

    req->noOfCharsets = tabPtr.p->noOfCharsets;

    req->checksumIndicator = 1;

    req->GCPIndicator = 1;
@@ -5984,8 +5983,8 @@ void Dbdict::handleTabInfoInit(SimpleProperties::Reader & it, 
  tablePtr.p->m_tablespace_id = c_tableDesc.TablespaceId; 

  tablePtr.p->maxRowsLow = c_tableDesc.MaxRowsLow; 

  tablePtr.p->maxRowsHigh = c_tableDesc.MaxRowsHigh; 

  tablePtr.p->minRowsLow = tableDesc.MinRowsLow;

  tablePtr.p->minRowsHigh = tableDesc.MinRowsHigh;

  tablePtr.p->minRowsLow = c_tableDesc.MinRowsLow;

  tablePtr.p->minRowsHigh = c_tableDesc.MinRowsHigh;

  tablePtr.p->defaultNoPartFlag = c_tableDesc.DefaultNoPartFlag; 

  tablePtr.p->linearHashFlag = c_tableDesc.LinearHashFlag;