diff options
| author | drh <drh@noemail.net> | 2009-02-04 19:16:23 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2009-02-04 19:16:23 +0000 |
| commit | 9e7ba7c69ac0fa7bc01b78fede2e4afabc39dc0a (patch) | |
| tree | 2e5741d4654751a898a9b6be1014d1a94b8d1263 /src | |
| parent | b309becded48bebc6193d47d80354117aa518716 (diff) | |
| download | sqlite-9e7ba7c69ac0fa7bc01b78fede2e4afabc39dc0a.tar.gz sqlite-9e7ba7c69ac0fa7bc01b78fede2e4afabc39dc0a.zip | |
If the truncate operation fails in journalmode=TRUNCATE, do not fall back
to overwriting the journal header with zeros. Simply fail the operation. (CVS 6257)
FossilOrigin-Name: d4af60e52a12262ad0194908e68a386c719fe177
Diffstat (limited to 'src')
| -rw-r--r-- | src/pager.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/pager.c b/src/pager.c index eb794de57..0d85debd6 100644 --- a/src/pager.c +++ b/src/pager.c @@ -18,7 +18,7 @@ ** file simultaneously, or one process from reading the database while ** another is writing. ** -** @(#) $Id: pager.c,v 1.565 2009/02/04 10:09:04 danielk1977 Exp $ +** @(#) $Id: pager.c,v 1.566 2009/02/04 19:16:23 drh Exp $ */ #ifndef SQLITE_OMIT_DISKIO #include "sqliteInt.h" @@ -1295,8 +1295,8 @@ static int pager_end_transaction(Pager *pPager, int hasMaster){ if( !isMemoryJournal ){ rc = sqlite3OsDelete(pPager->pVfs, pPager->zJournal, 0); } - }else if( pPager->journalMode==PAGER_JOURNALMODE_TRUNCATE - && (rc = sqlite3OsTruncate(pPager->jfd, 0))==SQLITE_OK ){ + }else if( pPager->journalMode==PAGER_JOURNALMODE_TRUNCATE ){ + rc = sqlite3OsTruncate(pPager->jfd, 0); pPager->journalOff = 0; pPager->journalStarted = 0; }else if( pPager->exclusiveMode |