Commit d47a5d08 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/jonas/src/mysql-5.0 

into mysql.com:/home/jonas/src/mysql-5.0-ndb


BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/triggers/post-commit:
  Auto merged
ndb/include/kernel/signaldata/CreateIndx.hpp:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
parents dde2e462 918a030b

mysql-test/t/kill.test

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ select get_lock("a", 10); 
connection con2;

let $ID= `select connection_id()`;

send select get_lock("a", 10);

-- sleep 2

--real_sleep 2;

connection con1;

disable_query_log;

eval kill query $ID;

ndb/include/kernel/signaldata/AlterIndx.hpp

+4 −2
Original line number Diff line number Diff line
@@ -201,8 +201,10 @@ private: 
  //Uint32 m_indexVersion;

  Uint32 m_errorCode;

  Uint32 m_errorLine;

  union {

    Uint32 m_errorNode;



    Uint32 masterNodeId; // if NotMaster

  };

public:

  AlterIndxConf* getConf() {

    return &m_conf;

ndb/include/kernel/signaldata/BuildIndx.hpp

+2 −2
Original line number Diff line number Diff line
@@ -242,9 +242,8 @@ public: 
    AllocationFailure = 4252,

    InternalError = 4346

  };

  STATIC_CONST( SignalLength = BuildIndxConf::SignalLength + 1 );

  STATIC_CONST( SignalLength = BuildIndxConf::SignalLength + 2 );



private:

  //Uint32 m_userRef;

  //Uint32 m_connectionPtr;

  //Uint32 m_requestInfo;
@@ -253,6 +252,7 @@ private: 
  //Uint32 m_indexId;

  BuildIndxConf m_conf;

  Uint32 m_errorCode;

  Uint32 masterNodeId;



public:

  BuildIndxConf* getConf() {

ndb/include/kernel/signaldata/CreateIndx.hpp

+4 −2
Original line number Diff line number Diff line
@@ -220,8 +220,10 @@ public: 
  //Uint32 m_indexVersion;

  Uint32 m_errorCode;

  Uint32 m_errorLine;

  union {

    Uint32 m_errorNode;



    Uint32 masterNodeId; // If NotMaster

  };

public:

  CreateIndxConf* getConf() {

    return &m_conf;

ndb/include/kernel/signaldata/CreateTrig.hpp

+4 −2
Original line number Diff line number Diff line
@@ -311,8 +311,10 @@ private: 
  //Uint32 m_triggerInfo;

  Uint32 m_errorCode;

  Uint32 m_errorLine;

  union {

    Uint32 m_errorNode;



    Uint32 masterNodeId; // When NotMaster

  };

public:

  CreateTrigConf* getConf() {

    return &m_conf;