Commit b6a9dc96 authored by unknown's avatar unknown
Browse files

ndb - bug#8876 


ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  merge error?
parent d6c9c194

ndb/src/kernel/blocks/dbtc/DbtcMain.cpp

+0 −1
Original line number Diff line number Diff line
@@ -5937,7 +5937,6 @@ int Dbtc::releaseAndAbort(Signal* signal) 
      signal->theData[2] = apiConnectptr.p->transid[0];

      signal->theData[3] = apiConnectptr.p->transid[1];

      sendSignal(tblockref, GSN_ABORT, signal, 4, JBB);

      return 1;

    } else {

      jam();

      signal->theData[0] = tcConnectptr.i;