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

Modified to use lock manager in toolkit.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/flaim/code/trunk@490 0109f412-320b-0410-ab79-c3e0c5ffbbe6
This commit is contained in:
dsandersoremutah
2006-05-31 15:23:25 +00:00
parent f23dd3c2a9
commit 78bd30e364
21 changed files with 115 additions and 1912 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
sql/src/fdbcnfig.cpp
View File

@@ -64,8 +64,8 @@ RCODE F_Db::setRflKeepFilesFlag(
if (!(m_uiFlags & (FDB_HAS_FILE_LOCK | FDB_FILE_LOCK_SHARED)))
{
if (RC_BAD( rc = dbLock( SFLM_LOCK_EXCLUSIVE, 0,
SFLM_NO_TIMEOUT)))
if (RC_BAD( rc = dbLock( FLM_LOCK_EXCLUSIVE, 0,
FLM_NO_TIMEOUT)))
{
goto Exit;
}
@@ -88,7 +88,7 @@ RCODE F_Db::setRflKeepFilesFlag(
// go to a new RFL file so that the new RFL file gets new
// serial numbers and a new keep or no-keep flag.
if (RC_BAD( rc = doCheckpoint( SFLM_NO_TIMEOUT)))
if (RC_BAD( rc = doCheckpoint( FLM_NO_TIMEOUT)))
{
goto Exit;
}
@@ -175,8 +175,8 @@ RCODE F_Db::setRflDir(
if (!(m_uiFlags & (FDB_HAS_FILE_LOCK | FDB_FILE_LOCK_SHARED)))
{
if( RC_BAD( rc = dbLock( SFLM_LOCK_EXCLUSIVE, 0,
SFLM_NO_TIMEOUT)))
if( RC_BAD( rc = dbLock( FLM_LOCK_EXCLUSIVE, 0,
FLM_NO_TIMEOUT)))
{
goto Exit;
}
@@ -192,7 +192,7 @@ RCODE F_Db::setRflDir(
// ensures that no more transactions will be logged to the current
// RFL file.
if (RC_BAD( rc = doCheckpoint( SFLM_NO_TIMEOUT)))
if (RC_BAD( rc = doCheckpoint( FLM_NO_TIMEOUT)))
{
goto Exit;
}
@@ -1273,7 +1273,7 @@ RCODE F_Db::getLockWaiters(
if (m_pDatabase->m_pDatabaseLockObj)
{
rc = m_pDatabase->m_pDatabaseLockObj->GetLockInfo( pLockInfo);
rc = m_pDatabase->m_pDatabaseLockObj->getLockInfo( pLockInfo);
}
else
{