diff options
| author | drh <drh@noemail.net> | 2010-07-30 16:44:29 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2010-07-30 16:44:29 +0000 |
| commit | 1e8ed64ed03b5d44876a9e558c89fa07884da8b5 (patch) | |
| tree | 0545ee8bf0e524af04195af719fc759bff206bad /src | |
| parent | 1e01cf1b84238f58935e72cea54fdcfb621d04da (diff) | |
| download | sqlite-1e8ed64ed03b5d44876a9e558c89fa07884da8b5.tar.gz sqlite-1e8ed64ed03b5d44876a9e558c89fa07884da8b5.zip | |
Remove a test from sqlite3PagerCommitPhaseOne which is now always true
after the multi-file transaction fix.
FossilOrigin-Name: 6758f6a8ec97941e09847b309812b3194eb57f19
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 ed7a8d2c7..5f8a90c58 100644 --- a/src/pager.c +++ b/src/pager.c @@ -1082,7 +1082,6 @@ static int writeMasterJournal(Pager *pPager, const char *zMaster){ u32 cksum = 0; /* Checksum of string zMaster */ assert( pPager->setMaster==0 ); - if( !zMaster || pPager->journalMode==PAGER_JOURNALMODE_MEMORY || pPager->journalMode==PAGER_JOURNALMODE_OFF @@ -5139,7 +5138,7 @@ int sqlite3PagerCommitPhaseOne( ** backup in progress needs to be restarted. */ sqlite3BackupRestart(pPager->pBackup); - }else if( pPager->state!=PAGER_SYNCED && pPager->dbModified ){ + }else if( pPager->dbModified ){ if( pagerUseWal(pPager) ){ PgHdr *pList = sqlite3PcacheDirtyList(pPager->pPCache); if( pList ){ @@ -5277,6 +5276,7 @@ int sqlite3PagerCommitPhaseOne( IOTRACE(("DBSYNC %p\n", pPager)) } + assert( pPager->state!=PAGER_SYNCED ); pPager->state = PAGER_SYNCED; } |