diff options
| author | dan <dan@noemail.net> | 2016-11-11 18:45:55 +0000 |
|---|---|---|
| committer | dan <dan@noemail.net> | 2016-11-11 18:45:55 +0000 |
| commit | 04cd7aa373d0218a766aa24987a99d16bcdcbac2 (patch) | |
| tree | f44e1af007c5bd8eb814cac3bec1bea0476ec781 /src/pager.c | |
| parent | 9af90b7231660b5c5670e41ad58c755d95d0fbaa (diff) | |
| parent | 4a5bad572ae669f2c6da3299303840bf3852d5b3 (diff) | |
| download | sqlite-04cd7aa373d0218a766aa24987a99d16bcdcbac2.tar.gz sqlite-04cd7aa373d0218a766aa24987a99d16bcdcbac2.zip | |
Merge trunk with this branch.
FossilOrigin-Name: dd62d2de6eb12dc1902d6df050c395b1dcac01b4
Diffstat (limited to 'src/pager.c')
| -rw-r--r-- | src/pager.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/pager.c b/src/pager.c index 71c4acdb9..04ce19547 100644 --- a/src/pager.c +++ b/src/pager.c @@ -4033,7 +4033,10 @@ int sqlite3PagerClose(Pager *pPager, sqlite3 *db){ /* pPager->errCode = 0; */ pPager->exclusiveMode = 0; #ifndef SQLITE_OMIT_WAL - sqlite3WalClose(pPager->pWal,db,pPager->ckptSyncFlags,pPager->pageSize,pTmp); + assert( db || pPager->pWal==0 ); + sqlite3WalClose(pPager->pWal, db, pPager->ckptSyncFlags, pPager->pageSize, + (db && (db->flags & SQLITE_NoCkptOnClose) ? 0 : pTmp) + ); pPager->pWal = 0; #endif pager_reset(pPager); |