diff options
| author | drh <drh@noemail.net> | 2010-06-21 21:45:37 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2010-06-21 21:45:37 +0000 |
| commit | 39cf51097f676bcd93c65efd1e8e1e0dec850dc1 (patch) | |
| tree | 712303b1b5b66b4a59d02f45ebc5987c969c3a68 /src | |
| parent | de3c301d634fec415a1e4bfcbf1d6723f73e363d (diff) | |
| download | sqlite-39cf51097f676bcd93c65efd1e8e1e0dec850dc1.tar.gz sqlite-39cf51097f676bcd93c65efd1e8e1e0dec850dc1.zip | |
Minor tweaks to get the pager working for corner cases when the
SQLITE_IOCAP_UNDELETABLE_WHEN_OPEN flag is set.
FossilOrigin-Name: 82b38fca1aea345ade954517661145f1859e701c
Diffstat (limited to 'src')
| -rw-r--r-- | src/pager.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/pager.c b/src/pager.c index a02385747..61b60dc47 100644 --- a/src/pager.c +++ b/src/pager.c @@ -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) ){ |