diff options
| author | unknown <tomas@poseidon.mysql.com> | 2007-02-26 23:52:11 +0700 |
|---|---|---|
| committer | unknown <tomas@poseidon.mysql.com> | 2007-02-26 23:52:11 +0700 |
| commit | 7c1572de789780fda65aed61f541658c690d91c4 (patch) | |
| tree | 70018342b215bf732026a5778d6f2045827b731d /storage | |
| parent | 0b60b1d3b7f13f9e8ec38393a8b5634c237c39ee (diff) | |
| download | mariadb-git-7c1572de789780fda65aed61f541658c690d91c4.tar.gz | |
corrected manual merge
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/ndb/src/ndbapi/TransporterFacade.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/storage/ndb/src/ndbapi/TransporterFacade.cpp b/storage/ndb/src/ndbapi/TransporterFacade.cpp index 24bf6dbbc6a..f982c36cba1 100644 --- a/storage/ndb/src/ndbapi/TransporterFacade.cpp +++ b/storage/ndb/src/ndbapi/TransporterFacade.cpp @@ -1527,7 +1527,8 @@ SignalSender::sendSignal(Uint16 nodeId, const SimpleSignal * s){ signalLogger.flushSignalLog(); } #endif - + assert(getNodeInfo(nodeId).m_api_reg_conf == true || + s->readSignalNumber() == GSN_API_REGREQ); return theFacade->theTransporterRegistry->prepareSend(&s->header, 1, // JBB &s->theData[0], |