diff options
| author | drh <drh@noemail.net> | 2004-02-25 02:20:41 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2004-02-25 02:20:41 +0000 |
| commit | 946966f2a1e40ac73bc37dfa498d6e39a0425e08 (patch) | |
| tree | 01c91d40b701f2f5f2c2dce93573c1cddd5b5926 /src | |
| parent | cd44690ad042e6bb5c2331ffad5eb77373928d88 (diff) | |
| download | sqlite-946966f2a1e40ac73bc37dfa498d6e39a0425e08.tar.gz sqlite-946966f2a1e40ac73bc37dfa498d6e39a0425e08.zip | |
Disable an assert which (as it turns out) is not always true. Ticket #615. (CVS 1269)
FossilOrigin-Name: 2773c1d384b750eee037e6ccc61bc56b5204d690
Diffstat (limited to 'src')
| -rw-r--r-- | src/pager.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/pager.c b/src/pager.c index 223de8e63..8b6a15465 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.100 2004/02/11 09:46:32 drh Exp $ +** @(#) $Id: pager.c,v 1.101 2004/02/25 02:20:41 drh Exp $ */ #include "os.h" /* Must be first to enable large file support */ #include "sqliteInt.h" @@ -841,6 +841,7 @@ end_ckpt_playback: void sqlitepager_set_cachesize(Pager *pPager, int mxPage){ if( mxPage>=0 ){ pPager->noSync = pPager->tempFile; + if( pPager->noSync==0 ) pPager->needSync = 0; }else{ pPager->noSync = 1; mxPage = -mxPage; @@ -879,6 +880,7 @@ void sqlitepager_set_cachesize(Pager *pPager, int mxPage){ void sqlitepager_set_safety_level(Pager *pPager, int level){ pPager->noSync = level==1 || pPager->tempFile; pPager->fullSync = level==3 && !pPager->tempFile; + if( pPager->noSync==0 ) pPager->needSync = 0; } /* @@ -1180,7 +1182,8 @@ static int syncJournal(Pager *pPager){ if( pPager->needSync ){ if( !pPager->tempFile ){ assert( pPager->journalOpen ); - assert( !pPager->noSync ); + /* assert( !pPager->noSync ); // noSync might be set if synchronous + ** was turned off after the transaction was started. Ticket #615 */ #ifndef NDEBUG { /* Make sure the pPager->nRec counter we are keeping agrees |