Commit f44acb04 authored by unknown's avatar unknown
Browse files

Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-ndb 

into neptunus.(none):/home/msvensson/mysql/bug9626


ndb/src/ndbapi/Ndb.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
parents da4a8133 3d238b81

ndb/include/kernel/AttributeList.hpp

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ 
#ifndef ATTRIBUTE_LIST_HPP

#define ATTRIBUTE_LIST_HPP



#include "ndb_limits.h"



/**

 * Masks and lists used by index and trigger.  Must be plain old Uint32 data.

 * XXX depends on other headers XXX move to some common file

ndb/include/ndbapi/Ndb.hpp

+7 −5
Original line number Diff line number Diff line
@@ -1583,15 +1583,17 @@ private: 
  void    abortTransactionsAfterNodeFailure(Uint16 aNodeId);



  static

  const char * externalizeTableName(const char * internalTableName, bool fullyQualifiedNames);

  const char * externalizeTableName(const char * internalTableName,

                                    bool fullyQualifiedNames);

  const char * externalizeTableName(const char * internalTableName);

  const char * internalizeTableName(const char * externalTableName);

  const BaseString internalize_table_name(const char * external_name) const;



  static

  const char * externalizeIndexName(const char * internalIndexName, bool fullyQualifiedNames);

  const char * externalizeIndexName(const char * internalIndexName,

                                    bool fullyQualifiedNames);

  const char * externalizeIndexName(const char * internalIndexName);

  const char * internalizeIndexName(const NdbTableImpl * table,

				    const char * externalIndexName);

  const BaseString internalize_index_name(const NdbTableImpl * table,

                                          const char * external_name) const;



  static

  const BaseString getDatabaseFromInternalName(const char * internalName);

ndb/include/transporter/TransporterDefinitions.hpp

+1 −2
Original line number Diff line number Diff line
@@ -45,9 +45,8 @@ enum SendStatus { 
 * Protocol6 Header + 

 *  (optional signal id) + (optional checksum) + (signal data)

 */

const Uint32 MAX_SECTION_SIZE= 4096;

//const Uint32 MAX_MESSAGE_SIZE = (12+4+4+(4*25));

const Uint32 MAX_MESSAGE_SIZE = (12+4+4+(4*25)+(3*4)+4*MAX_SECTION_SIZE);

const Uint32 MAX_MESSAGE_SIZE = (12+4+4+(4*25)+(3*4)+4*4096);



/**

 * TransporterConfiguration

ndb/include/util/SimpleProperties.hpp

+3 −1
Original line number Diff line number Diff line
@@ -172,6 +172,8 @@ public: 
    virtual bool reset() = 0;

    virtual bool putWord(Uint32 val) = 0;

    virtual bool putWords(const Uint32 * src, Uint32 len) = 0;

  private:

    bool add(const char* value, int len);

  };

};
@@ -211,7 +213,7 @@ private: 
};



/**

 * Writer for linear memory

 * Writer for UtilBuffer

 */

class UtilBufferWriter : public SimpleProperties::Writer {

public:

ndb/src/common/util/SimpleProperties.cpp

+28 −6
Original line number Diff line number Diff line
@@ -36,6 +36,28 @@ SimpleProperties::Writer::add(Uint16 key, Uint32 value){ 
  return putWord(htonl(value));

}



bool

SimpleProperties::Writer::add(const char * value, int len){

  const Uint32 valLen = (len + 3) / 4;



  if ((len % 4) == 0)

    return putWords((Uint32*)value, valLen);



  const Uint32 putLen= valLen - 1;

  if (!putWords((Uint32*)value, putLen))

    return false;



  // Special handling of last bytes

  union {

    Uint32 lastWord;

    char lastBytes[4];

  };

  memcpy(lastBytes,

         value + putLen*4,

         len - putLen*4);

  return putWord(lastWord);

}



bool

SimpleProperties::Writer::add(Uint16 key, const char * value){

  Uint32 head = StringValue;
@@ -47,8 +69,8 @@ SimpleProperties::Writer::add(Uint16 key, const char * value){ 
  if(!putWord(htonl(strLen)))

    return false;



  const Uint32 valLen = (strLen + 3) / 4;

  return putWords((Uint32*)value, valLen);

  return add(value, (int)strLen);



}



bool
@@ -61,8 +83,7 @@ SimpleProperties::Writer::add(Uint16 key, const void* value, int len){ 
  if(!putWord(htonl(len)))

    return false;



  const Uint32 valLen = (len + 3) / 4;

  return putWords((Uint32*)value, valLen);

  return add((const char*)value, len);

}



SimpleProperties::Reader::Reader(){
@@ -392,6 +413,7 @@ UtilBufferWriter::putWords(const Uint32 * src, Uint32 len){ 
  return (m_buf.append(src, 4 * len) == 0);

}





Uint32

UtilBufferWriter::getWordsUsed() const { return m_buf.length() / 4;}