ndb - bug#8876

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

ndb - bug#8876
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: merge error?
b6a9dc96 · unknown · d6c9c194 · b6a9dc96
Commit b6a9dc96 authored Mar 03, 2005 by unknown
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

ndb/src/kernel/blocks/dbtc/DbtcMain.cpp ndb/src/kernel/blocks/dbtc/DbtcMain.cpp +0 -1

No files found.
--- a/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
+++ b/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
@@ -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;