diff options
| author | drh <drh@noemail.net> | 2014-04-18 01:10:05 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2014-04-18 01:10:05 +0000 |
| commit | a1a483d54e39272c16b5fa94e97578ccddee6a8a (patch) | |
| tree | b28bb3ea6cdff4cdefa08c26c870e415e996c730 /src/pager.c | |
| parent | 652cc4b6dca02426e8d375a962bf8417850d9f7a (diff) | |
| parent | 71794dbaeb73f594ef704fa265715b207f98edc7 (diff) | |
| download | sqlite-a1a483d54e39272c16b5fa94e97578ccddee6a8a.tar.gz sqlite-a1a483d54e39272c16b5fa94e97578ccddee6a8a.zip | |
Merge recent trunk changes into sessions.
FossilOrigin-Name: 95e77efe076ab421bd246119c47dba5dacf9d087
Diffstat (limited to 'src/pager.c')
| -rw-r--r-- | src/pager.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/pager.c b/src/pager.c index c6485a4d4..b09d6cb93 100644 --- a/src/pager.c +++ b/src/pager.c @@ -1624,12 +1624,11 @@ static int writeMasterJournal(Pager *pPager, const char *zMaster){ if( !zMaster || pPager->journalMode==PAGER_JOURNALMODE_MEMORY - || pPager->journalMode==PAGER_JOURNALMODE_OFF + || !isOpen(pPager->jfd) ){ return SQLITE_OK; } pPager->setMaster = 1; - assert( isOpen(pPager->jfd) ); assert( pPager->journalHdr <= pPager->journalOff ); /* Calculate the length in bytes and the checksum of zMaster */ |