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

Fix an assert in pager.c. And various test cases that fail with the in-memory journal permutation.

FossilOrigin-Name: 78fc35ff4b01d4a583009ec8b8bf876738ca7b92
This commit is contained in:
dan
2010-07-03 13:45:52 +00:00
parent 40e459e041
commit 3f94b60961
6 changed files with 64 additions and 26 deletions

View File

@@ -5165,7 +5165,10 @@ int sqlite3PagerCommitPhaseOne(
*/
#ifdef SQLITE_ENABLE_ATOMIC_WRITE
PgHdr *pPg;
assert( isOpen(pPager->jfd) || pPager->journalMode==PAGER_JOURNALMODE_OFF );
assert( isOpen(pPager->jfd)
|| pPager->journalMode==PAGER_JOURNALMODE_OFF
|| pPager->journalMode==PAGER_JOURNALMODE_WAL
);
if( !zMaster && isOpen(pPager->jfd)
&& pPager->journalOff==jrnlBufferSize(pPager)
&& pPager->dbSize>=pPager->dbFileSize