mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
Update error handling of new scan
Still known bugs :-( ndb/include/kernel/signaldata/ScanTab.hpp: Add close flag ndb/include/ndbapi/NdbConnection.hpp: Moved mehtod outside ndb/include/ndbapi/NdbScanOperation.hpp: Removed err code from ndb/src/common/debugger/signaldata/ScanTab.cpp: Updated printer ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: New error inserts for SCAN ndb/src/kernel/blocks/dbtc/Dbtc.hpp: Update handling of frag timeouts ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Update handling of frag timeouts ndb/src/kernel/blocks/dbtup/DbtupBuffer.cpp: Don't send empty TRANSID_AI's ndb/src/ndbapi/NdbConnectionScan.cpp: Update error handling of scan ndb/src/ndbapi/NdbScanOperation.cpp: Update error handling of scan ndb/src/ndbapi/Ndbif.cpp: Update error handling of scan
This commit is contained in:
@ -633,17 +633,7 @@ private:
|
||||
#ifdef VM_TRACE
|
||||
void printState();
|
||||
#endif
|
||||
|
||||
bool checkState_TransId(const Uint32 * transId) const {
|
||||
const Uint32 tTmp1 = transId[0];
|
||||
const Uint32 tTmp2 = transId[1];
|
||||
Uint64 tRecTransId = (Uint64)tTmp1 + ((Uint64)tTmp2 << 32);
|
||||
bool b = theStatus == Connected && theTransactionId == tRecTransId;
|
||||
#ifdef NDB_NO_DROPPED_SIGNAL
|
||||
if(!b) abort();
|
||||
#endif
|
||||
return b;
|
||||
}
|
||||
bool checkState_TransId(const Uint32 * transId) const;
|
||||
};
|
||||
|
||||
inline
|
||||
@ -678,6 +668,19 @@ NdbConnection::checkMagicNumber()
|
||||
}
|
||||
}
|
||||
|
||||
inline
|
||||
bool
|
||||
NdbConnection::checkState_TransId(const Uint32 * transId) const {
|
||||
const Uint32 tTmp1 = transId[0];
|
||||
const Uint32 tTmp2 = transId[1];
|
||||
Uint64 tRecTransId = (Uint64)tTmp1 + ((Uint64)tTmp2 << 32);
|
||||
bool b = theStatus == Connected && theTransactionId == tRecTransId;
|
||||
#ifdef NDB_NO_DROPPED_SIGNAL
|
||||
if(!b) abort();
|
||||
#endif
|
||||
return b;
|
||||
}
|
||||
|
||||
/************************************************************************************************
|
||||
void setTransactionId(Uint64 aTransactionId);
|
||||
|
||||
|
Reference in New Issue
Block a user