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

Sync up with latest common toolkit changes.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/flaim/code/trunk@612 0109f412-320b-0410-ab79-c3e0c5ffbbe6
This commit is contained in:
dsandersoremutah
2006-06-23 21:26:53 +00:00
parent e60875e316
commit 58d6cbdace
26 changed files with 1164 additions and 3920 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/src/scache.cpp
View File

@@ -3802,8 +3802,7 @@ RCODE F_Database::writeContiguousBlocks(
// non-asynchronous write.
rc = pSFileHdl->writeBlock( uiBlkAddress, uiWriteLen,
pucWriteBuffer, pIOBuffer->getBufferSize(),
pAsyncBuffer, &uiBytesWritten);
pucWriteBuffer, pAsyncBuffer, &uiBytesWritten);
if (!pAsyncBuffer)
{
pIOBuffer->notifyComplete( rc);
@@ -6074,8 +6073,8 @@ RCODE F_BlockCacheMgr::initCache( void)
}
if (RC_BAD( rc = m_pBlockAllocator->setup(
gv_SFlmSysData.pGlobalCacheMgr->m_pSlabManager, uiBlockSizes,
&m_Usage.slabUsage)))
gv_SFlmSysData.pGlobalCacheMgr->m_pSlabManager, NULL, uiBlockSizes,
&m_Usage.slabUsage, NULL)))
{
goto Exit;
}