1
0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-05 15:55:57 +03:00

Remove a test from sqlite3PagerCommitPhaseOne which is now always true

after the multi-file transaction fix.

FossilOrigin-Name: 6758f6a8ec97941e09847b309812b3194eb57f19
This commit is contained in:
drh
2010-07-30 16:44:29 +00:00
parent 1e01cf1b84
commit 1e8ed64ed0
3 changed files with 20 additions and 10 deletions

View File

@@ -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;
}