diff options
author | dan <dan@noemail.net> | 2020-05-06 17:18:57 +0000 |
---|---|---|
committer | dan <dan@noemail.net> | 2020-05-06 17:18:57 +0000 |
commit | d0e6d133017d7fb82f0d16071eefc2c962762390 (patch) | |
tree | 753b30b89b27d81e893a93d45eccd2a8bdcf5b49 /src/os_unix.c | |
parent | 293e9f5d6cd1ae9a91de09e85d1a03d777a71f3d (diff) | |
download | sqlite-d0e6d133017d7fb82f0d16071eefc2c962762390.tar.gz sqlite-d0e6d133017d7fb82f0d16071eefc2c962762390.zip |
Add tests for running recovery when opening a write transaction or performing a checkpoint with blocking locks enabled. Fix some failing assert() statements.
FossilOrigin-Name: d096ea3fe20f8af90f9e3f798fd0a69527b32ac8e208ade58b9d0af0e831f41b
Diffstat (limited to 'src/os_unix.c')
-rw-r--r-- | src/os_unix.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/os_unix.c b/src/os_unix.c index e1ed575b0..72c446ea7 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -4832,7 +4832,6 @@ static int unixShmLock( #ifdef SQLITE_ENABLE_SETLK_TIMEOUT assert( (flags & SQLITE_SHM_UNLOCK) || pDbFd->iBusyTimeout==0 || ( (ofst!=2) /* not RECOVER */ - && (n==1) /* Single lock only */ && (ofst!=1 || (p->exclMask|p->sharedMask)==0) && (ofst!=0 || (p->exclMask|p->sharedMask)<3) && (ofst<3 || (p->exclMask|p->sharedMask)<(1<<ofst)) |