summaryrefslogtreecommitdiff
path: root/ndb
diff options
context:
space:
mode:
Diffstat (limited to 'ndb')
-rw-r--r--ndb/src/kernel/blocks/dbtc/DbtcMain.cpp6
-rw-r--r--ndb/src/ndbapi/NdbTransaction.cpp1
2 files changed, 1 insertions, 6 deletions
diff --git a/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp b/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
index 57daffbf331..40d5dcf7407 100644
--- a/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
+++ b/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
@@ -5162,7 +5162,6 @@ void Dbtc::execLQHKEYREF(Signal* signal)
TcIndexData* indexData = c_theIndexes.getPtr(currentIndexId);
indexId = indexData->indexId;
regApiPtr->errorData = indexId;
- ndbout_c("LQHKEYREF, found index %u", indexId);
const Uint32 opType = regTcPtr->operation;
if (errCode == ZALREADYEXIST)
errCode = terrorCode = ZNOTUNIQUE;
@@ -5246,7 +5245,6 @@ void Dbtc::execLQHKEYREF(Signal* signal)
jam();
regApiPtr->lqhkeyreqrec--; // Compensate for extra during read
tcKeyRef->connectPtr = indexOp;
- ndbout_c("TCKEYREF, sending index %u", indexId);
tcKeyRef->errorData = indexId;
EXECUTE_DIRECT(DBTC, GSN_TCKEYREF, signal, TcKeyRef::SignalLength);
apiConnectptr.i = save;
@@ -5254,7 +5252,6 @@ void Dbtc::execLQHKEYREF(Signal* signal)
} else {
jam();
tcKeyRef->connectPtr = clientData;
- ndbout_c("TCKEYREF, sending index %u", indexId);
tcKeyRef->errorData = indexId;
sendSignal(regApiPtr->ndbapiBlockref,
GSN_TCKEYREF, signal, TcKeyRef::SignalLength, JBB);
@@ -12234,7 +12231,7 @@ void Dbtc::execTRANSID_AI(Signal* signal)
tcIndxRef->transId[0] = regApiPtr->transid[0];
tcIndxRef->transId[1] = regApiPtr->transid[1];
tcIndxRef->errorCode = 4349;
- // tcIndxRef->errorData = ??; Where to find indexId
+ tcIndxRef->errorData = regApiPtr->errorData;
sendSignal(regApiPtr->ndbapiBlockref, GSN_TCINDXREF, signal,
TcKeyRef::SignalLength, JBB);
return;
@@ -13030,7 +13027,6 @@ void Dbtc::insertIntoIndexTable(Signal* signal,
}
regApiPtr->currSavePointId = currSavePointId;
- ndbout_c("TCKEYREQ, saving index %u", indexData->indexId);
tcConnectptr.p->currentIndexId = indexData->indexId;
// *********** KEYINFO ***********
diff --git a/ndb/src/ndbapi/NdbTransaction.cpp b/ndb/src/ndbapi/NdbTransaction.cpp
index 262deb0050e..7d3281a93d1 100644
--- a/ndb/src/ndbapi/NdbTransaction.cpp
+++ b/ndb/src/ndbapi/NdbTransaction.cpp
@@ -1769,7 +1769,6 @@ transactions.
theError.code = aSignal->readData(4);// Override any previous errors
if (aSignal->getLength() == TcRollbackRep::SignalLength)
{
- DBUG_PRINT("info", ("Found error data %u", aSignal->readData(5)));
// Signal may contain additional error data
theError.details = (char *) aSignal->readData(5);
}