mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 05:22:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bug#4586 + TC fix

Browse source
This commit is contained in:
joreland@mysql.com 2004-08-06 11:29:56 +02:00
parent 99ec08873b
commit 6b8e4c93d9
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
View file

@ -4959,6 +4959,7 @@ void Dbtc::execLQHKEYREF(Signal* signal)
}
}
Uint32 marker = regTcPtr->commitAckMarker;
markOperationAborted(regApiPtr, regTcPtr);
if(regApiPtr->apiConnectstate == CS_ABORTING){
@ -4978,7 +4979,7 @@ void Dbtc::execLQHKEYREF(Signal* signal)
return;
}//if
if (regTcPtr->commitAckMarker != RNIL){
if (marker != RNIL){
/**
* This was an insert/update/delete/write which failed
* that contained the marker

5
ndb/src/kernel/blocks/dbtup/DbtupPagMan.cpp
View file

@ -139,8 +139,9 @@ void Dbtup::initializePage()
ptrAss(pagePtr, page);
pagePtr.p->pageWord[ZPAGE_STATE_POS] = ~ZFREE_COMMON;
cnoOfAllocatedPages = 1 + MAX_PARALLELL_TUP_SRREQ;
returnCommonArea(cnoOfAllocatedPages, cnoOfPage - cnoOfAllocatedPages);
Uint32 tmp = 1 + MAX_PARALLELL_TUP_SRREQ;
returnCommonArea(tmp, cnoOfPage - tmp);
cnoOfAllocatedPages = tmp; // Is updated by returnCommonArea
c_sr_free_page_0 = ~0;
}//Dbtup::initializePage()