1
0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-07 02:42:48 +03:00

Minor tweaks to get the pager working for corner cases when the

SQLITE_IOCAP_UNDELETABLE_WHEN_OPEN flag is set.

FossilOrigin-Name: 82b38fca1aea345ade954517661145f1859e701c
This commit is contained in:
drh
2010-06-21 21:45:37 +00:00
parent de3c301d63
commit 39cf51097f
3 changed files with 12 additions and 12 deletions

View File

@@ -2576,7 +2576,7 @@ static int pagerPlaybackSavepoint(Pager *pPager, PagerSavepoint *pSavepoint){
}
assert( rc!=SQLITE_DONE );
}
assert( rc!=SQLITE_OK || pPager->journalOff==szJ );
assert( rc!=SQLITE_OK || pPager->journalOff>=szJ );
/* Finally, rollback pages from the sub-journal. Page that were
** previously rolled back out of the main journal (and are hence in pDone)
@@ -4707,7 +4707,7 @@ static int pager_write(PgHdr *pPg){
if( rc!=SQLITE_OK ){
return rc;
}
if( !isOpen(pPager->jfd)
if( pPager->pInJournal==0
&& pPager->journalMode!=PAGER_JOURNALMODE_OFF
&& !pagerUseWal(pPager)
){