Commit b6a9dc96 authored by unknown's avatar unknown

ndb - bug#8876

ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  merge error?
parent d6c9c194
No related merge requests found
...@@ -5937,7 +5937,6 @@ int Dbtc::releaseAndAbort(Signal* signal) ...@@ -5937,7 +5937,6 @@ int Dbtc::releaseAndAbort(Signal* signal)
signal->theData[2] = apiConnectptr.p->transid[0]; signal->theData[2] = apiConnectptr.p->transid[0];
signal->theData[3] = apiConnectptr.p->transid[1]; signal->theData[3] = apiConnectptr.p->transid[1];
sendSignal(tblockref, GSN_ABORT, signal, 4, JBB); sendSignal(tblockref, GSN_ABORT, signal, 4, JBB);
return 1;
} else { } else {
jam(); jam();
signal->theData[0] = tcConnectptr.i; signal->theData[0] = tcConnectptr.i;
......
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