diff options
| author | unknown <pekka@mysql.com> | 2005-03-03 11:38:50 +0100 |
|---|---|---|
| committer | unknown <pekka@mysql.com> | 2005-03-03 11:38:50 +0100 |
| commit | b6a9dc96c980d125198128378e2077ac33575d6b (patch) | |
| tree | da1b2731a27553fde69ab2ad786ffafe82b9b65a /ndb | |
| parent | d6c9c19412c4f640b161ff0909a55a093a839876 (diff) | |
| download | mariadb-git-b6a9dc96c980d125198128378e2077ac33575d6b.tar.gz | |
ndb - bug#8876
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
merge error?
Diffstat (limited to 'ndb')
| -rw-r--r-- | ndb/src/kernel/blocks/dbtc/DbtcMain.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp b/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp index 310ba6a9a0b..b30da54479b 100644 --- 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; |