aboutsummaryrefslogtreecommitdiff
path: root/src/wal.c
diff options
context:
space:
mode:
authordan <dan@noemail.net>2016-11-11 18:45:55 +0000
committerdan <dan@noemail.net>2016-11-11 18:45:55 +0000
commit04cd7aa373d0218a766aa24987a99d16bcdcbac2 (patch)
treef44e1af007c5bd8eb814cac3bec1bea0476ec781 /src/wal.c
parent9af90b7231660b5c5670e41ad58c755d95d0fbaa (diff)
parent4a5bad572ae669f2c6da3299303840bf3852d5b3 (diff)
downloadsqlite-04cd7aa373d0218a766aa24987a99d16bcdcbac2.tar.gz
sqlite-04cd7aa373d0218a766aa24987a99d16bcdcbac2.zip
Merge trunk with this branch.
FossilOrigin-Name: dd62d2de6eb12dc1902d6df050c395b1dcac01b4
Diffstat (limited to 'src/wal.c')
-rw-r--r--src/wal.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wal.c b/src/wal.c
index 50b95e416..d71ee81a5 100644
--- a/src/wal.c
+++ b/src/wal.c
@@ -1943,7 +1943,7 @@ int sqlite3WalClose(
**
** The EXCLUSIVE lock is not released before returning.
*/
- if( (db->flags & SQLITE_NoCkptOnClose)==0
+ if( zBuf!=0
&& SQLITE_OK==(rc = sqlite3OsLock(pWal->pDbFd, SQLITE_LOCK_EXCLUSIVE))
){
if( pWal->exclusiveMode==WAL_NORMAL_MODE ){