mars_nwe/mars-flaim
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed calls to disableLogging and enableLogging to work the way they used to.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/flaim/code/trunk@479 0109f412-320b-0410-ab79-c3e0c5ffbbe6
This commit is contained in:
dsandersoremutah
2006-05-30 21:31:58 +00:00
parent 82041bb5c7
commit f9a8601e63
9 changed files with 109 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
sql/src/fslfileu.cpp
View File

@@ -1042,10 +1042,11 @@ RCODE F_Db::maintBlockChainFree(
FLMUINT uiExpectedEndBlkAddr,
FLMUINT * puiBlocksFreed)
{
RCODE rc = NE_SFLM_OK;
FLMUINT uiBlocksFreed = 0;
FLMUINT uiEndBlkAddr = 0;
F_Row * pRow = NULL;
RCODE rc = NE_SFLM_OK;
FLMUINT uiBlocksFreed = 0;
FLMUINT uiEndBlkAddr = 0;
F_Row * pRow = NULL;
FLMUINT uiRflToken = 0;
// Make sure an update transaction is going and that a
// non-zero number of blocks was specified
@@ -1056,6 +1057,8 @@ RCODE F_Db::maintBlockChainFree(
goto Exit;
}
m_pDatabase->m_pRfl->disableLogging( &uiRflToken);
if( RC_BAD( rc = btFreeBlockChain(
this, NULL, uiStartBlkAddr, uiBlocksToFree,
&uiBlocksFreed, &uiEndBlkAddr, NULL)))
@@ -1095,6 +1098,11 @@ RCODE F_Db::maintBlockChainFree(
}
}
if (uiRflToken)
{
m_pDatabase->m_pRfl->enableLogging( &uiRflToken);
}
if( RC_BAD( rc = m_pDatabase->m_pRfl->logBlockChainFree(
this, ui64MaintRowId, uiStartBlkAddr, uiEndBlkAddr, uiBlocksFreed)))
{
@@ -1108,6 +1116,11 @@ RCODE F_Db::maintBlockChainFree(
Exit:
if (uiRflToken)
{
m_pDatabase->m_pRfl->enableLogging( &uiRflToken);
}
if (pRow)
{
pRow->ReleaseRow();