#At file:///home/jonas/src/telco-6.2/
2652 Jonas Oreland 2008-08-20
ndb - fix ERROR(8055) which was broken
modified:
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
=== modified file 'storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp'
--- a/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp 2008-08-11 10:41:11 +0000
+++ b/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp 2008-08-20 20:00:56 +0000
@@ -4732,10 +4732,7 @@ Dbtc::sendApiCommit(Signal* signal)
SET_ERROR_INSERT_VALUE(8056);
- Ptr<ApiConnectRecord> copyPtr;
- copyPtr.i = regApiPtr.p->apiCopyRecord;
- ptrCheckGuard(copyPtr, capiConnectFilesize, apiConnectRecord);
- return copyPtr;
+ goto err8055;
}
if (regApiPtr.p->returnsignal == RS_TCKEYCONF) {
@@ -4763,6 +4760,8 @@ Dbtc::sendApiCommit(Signal* signal)
TCKEY_abort(signal, 37);
return regApiPtr;
}//if
+
+err8055:
Ptr<ApiConnectRecord> copyPtr;
UintR TapiConnectFilesize = capiConnectFilesize;
UintR TcommitCount = c_counters.ccommitCount;
| Thread |
|---|
| • bzr commit into mysql-5.1 branch (jonas:2652) | Jonas Oreland | 20 Aug |