Commit 273be51d authored by unknown's avatar unknown
Browse files

Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-ndb


storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
parents 0b44f4b1 623f8bee

storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp

+2 −0
Original line number Diff line number Diff line
@@ -438,6 +438,7 @@ void Qmgr::execCONNECT_REP(Signal* signal) 
void

Qmgr::execREAD_NODESCONF(Signal* signal)

{

  jamEntry();

  check_readnodes_reply(signal, 

			refToNode(signal->getSendersBlockRef()),

			GSN_READ_NODESCONF);
@@ -446,6 +447,7 @@ Qmgr::execREAD_NODESCONF(Signal* signal) 
void

Qmgr::execREAD_NODESREF(Signal* signal)

{

  jamEntry();

  check_readnodes_reply(signal, 

			refToNode(signal->getSendersBlockRef()),

			GSN_READ_NODESREF);