database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-08 14:02:16 +03:00
Code Activity

Merge further trunk changes into experimental branch.

Browse Source 
FossilOrigin-Name: fb847d70407b0f0e548919b7554f62bc1dab8a6c
This commit is contained in:
dan
2010-07-30 07:26:51 +00:00
parent 76d5918243 3843a4c19a
commit 4d9c1b7fc4
11 changed files with 96 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/pager.c
View File

@@ -332,7 +332,7 @@ struct PagerSavepoint {
struct Pager {
sqlite3_vfs *pVfs; /* OS functions to use for IO */
u8 exclusiveMode; /* Boolean. True if locking_mode==EXCLUSIVE */
u8 journalMode; /* On of the PAGER_JOURNALMODE_* values */
u8 journalMode; /* One of the PAGER_JOURNALMODE_* values */
u8 useJournal; /* Use a rollback journal on this file */
u8 noReadlock; /* Do not bother to obtain readlocks */
u8 noSync; /* Do not sync the journal if true */
@@ -5152,7 +5152,7 @@ int sqlite3PagerCommitPhaseOne(
);
if( !zMaster && isOpen(pPager->jfd)
&& pPager->journalOff==jrnlBufferSize(pPager)
&& pPager->dbSize>=pPager->dbFileSize
&& pPager->dbSize>=pPager->dbOrigSize
&& (0==(pPg = sqlite3PcacheDirtyList(pPager->pPCache)) || 0==pPg->pDirty)
){
/* Update the db file change counter via the direct-write method. The
@@ -5418,7 +5418,7 @@ int sqlite3PagerMemUsed(Pager *pPager){
+ 5*sizeof(void*);
return perPageSize*sqlite3PcachePagecount(pPager->pPCache)
+ sqlite3MallocSize(pPager)
+ (pPager->pTmpSpace ? pPager->pageSize : 0);
+ pPager->pageSize;
}
/*