Commit 74371fd2 authored by unknown's avatar unknown
Browse files

ndb - 

  fix length of NDB$PK in unique index table


storage/ndb/tools/config.cpp:
  Rename: ndb/tools/config.cpp -> storage/ndb/tools/config.cpp
sql/ha_innodb.h:
  fix g++ compile error
sql/ha_ndbcluster.h:
  fix g++ compile error
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  fix length of NDB$PK in index table
parent 34f1aabc

sql/ha_innodb.h

+1 −1
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ class ha_innobase: public handler 
        static ulonglong get_mysql_bin_log_pos();

        bool primary_key_is_clustered() { return true; }

        int cmp_ref(const byte *ref1, const byte *ref2);

	bool ha_innobase::check_if_incompatible_data(HA_CREATE_INFO *info,

	bool check_if_incompatible_data(HA_CREATE_INFO *info,

						     uint table_changes);

};

sql/ha_ndbcluster.h

+1 −1
Original line number Diff line number Diff line
@@ -541,7 +541,7 @@ static void set_tabname(const char *pathname, char *tabname); 
                                     qc_engine_callback *engine_callback,

                                     ulonglong *engine_data);



  bool ha_ndbcluster::check_if_incompatible_data(HA_CREATE_INFO *info,

  bool check_if_incompatible_data(HA_CREATE_INFO *info,

						 uint table_changes);



private:

storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp

+2 −2
Original line number Diff line number Diff line
@@ -12549,7 +12549,7 @@ void Dbtc::insertIntoIndexTable(Signal* signal, 
  AttributeBuffer::DataBufferIterator iter;

  Uint32 attrId = 0;

  Uint32 keyLength = 0;

  Uint32 totalPrimaryKeyLength = 0;

  Uint32 totalPrimaryKeyLength = 1; // fragment length

  Uint32 hops;



  indexTabPtr.i = indexData->indexId;
@@ -12604,7 +12604,7 @@ void Dbtc::insertIntoIndexTable(Signal* signal, 
  }

  AttributeHeader pkAttrHeader(attrId, totalPrimaryKeyLength);

  Uint32 attributesLength = afterValues.getSize() + 

    pkAttrHeader.getHeaderSize() + pkAttrHeader.getDataSize() + 1;

    pkAttrHeader.getHeaderSize() + pkAttrHeader.getDataSize();

  

  TcKeyReq::setKeyLength(tcKeyRequestInfo, keyLength);

  tcKeyReq->attrLen = attributesLength;

ndb/tools/config.cpp→storage/ndb/tools/config.cpp

+0 −0

File moved.

View file