Commit 0c140b7b authored by unknown's avatar unknown
Browse files

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 

into poseidon.(none):/home/tomas/mysql-4.1-ndb-merge


ndb/src/common/mgmcommon/NdbConfig.c:
  Auto merged
ndb/src/ndbapi/ClusterMgr.cpp:
  Auto merged
parents dc37e041 9c71d59d

mysql-test/r/mysql_protocols.result

+2 −2
Original line number Diff line number Diff line
@@ -4,6 +4,6 @@ TCP 
 ok

SOCKET

 ok

ERROR 2047: Wrong or unknown protocol

ERROR 2047: Wrong or unknown protocol

ERROR 2047 (HY000): Wrong or unknown protocol

ERROR 2047 (HY000): Wrong or unknown protocol

Unknown option to protocol: NullS

ndb/src/ndbapi/ClusterMgr.cpp

+3 −5
Original line number Diff line number Diff line
@@ -452,13 +452,11 @@ ClusterMgr::reportNodeFailed(NodeId nodeId){ 
  theNode.nfCompleteRep = false;



  if(noOfConnectedNodes == 0){

    Uint32 theData[1];

    NFCompleteRep * rep = (NFCompleteRep *)&theData[0];



    NFCompleteRep rep;

    for(Uint32 i = 1; i<MAX_NODES; i++){

      if(theNodes[i].defined && theNodes[i].nfCompleteRep == false){

	rep->failedNodeId = i;

	execNF_COMPLETEREP(theData);

	rep.failedNodeId = i;

	execNF_COMPLETEREP((Uint32*)&rep);

      }

    }

  }