Commit 273be51d authored by unknown's avatar unknown

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
...@@ -438,6 +438,7 @@ void Qmgr::execCONNECT_REP(Signal* signal) ...@@ -438,6 +438,7 @@ void Qmgr::execCONNECT_REP(Signal* signal)
void void
Qmgr::execREAD_NODESCONF(Signal* signal) Qmgr::execREAD_NODESCONF(Signal* signal)
{ {
jamEntry();
check_readnodes_reply(signal, check_readnodes_reply(signal,
refToNode(signal->getSendersBlockRef()), refToNode(signal->getSendersBlockRef()),
GSN_READ_NODESCONF); GSN_READ_NODESCONF);
...@@ -446,6 +447,7 @@ Qmgr::execREAD_NODESCONF(Signal* signal) ...@@ -446,6 +447,7 @@ Qmgr::execREAD_NODESCONF(Signal* signal)
void void
Qmgr::execREAD_NODESREF(Signal* signal) Qmgr::execREAD_NODESREF(Signal* signal)
{ {
jamEntry();
check_readnodes_reply(signal, check_readnodes_reply(signal,
refToNode(signal->getSendersBlockRef()), refToNode(signal->getSendersBlockRef()),
GSN_READ_NODESREF); GSN_READ_NODESREF);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment