diff options
| author | tomas@poseidon.mysql.com <> | 2007-02-14 20:17:14 +0700 |
|---|---|---|
| committer | tomas@poseidon.mysql.com <> | 2007-02-14 20:17:14 +0700 |
| commit | 8a146f846122235d2f34b924c23474c74735e4b3 (patch) | |
| tree | 8218a060abbd44e1cde3524397563c1ce6ff3046 /storage | |
| parent | 19033682709ce13e5fcc4d8c79af4bd65b89bf76 (diff) | |
| download | mariadb-git-8a146f846122235d2f34b924c23474c74735e4b3.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 2402c979620..eabfc6bc371 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], |