diff options
author | dan <Dan Kennedy> | 2025-02-11 17:10:46 +0000 |
---|---|---|
committer | dan <Dan Kennedy> | 2025-02-11 17:10:46 +0000 |
commit | 138951dc2eb7256ae932d4b75266618773eb504b (patch) | |
tree | 9c6f157123d9bd225cc670605bc0324a44305937 /src/os_unix.c | |
parent | 2d878947004909b22c2057eb124b9d00fabe8d82 (diff) | |
parent | 62e1d44846baa68cdfcdcbdd58fcb4483cc5de47 (diff) | |
download | sqlite-138951dc2eb7256ae932d4b75266618773eb504b.tar.gz sqlite-138951dc2eb7256ae932d4b75266618773eb504b.zip |
Merge latest changes from trunk into this branch.
FossilOrigin-Name: e5ec5bb9f4dc3e02db7ab0e49686f47617af75d3f7d4ab23288a1aea4a693e59
Diffstat (limited to 'src/os_unix.c')
-rw-r--r-- | src/os_unix.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/os_unix.c b/src/os_unix.c index 7f92c5234..02fe7c819 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -1665,7 +1665,7 @@ static int unixFileLock(unixFile *pFile, struct flock *pLock){ if( (pFile->ctrlFlags & (UNIXFILE_EXCL|UNIXFILE_RDONLY))==UNIXFILE_EXCL ){ if( pInode->bProcessLock==0 ){ struct flock lock; - assert( pInode->nLock==0 ); + /* assert( pInode->nLock==0 ); <-- Not true if unix-excl READONLY used */ lock.l_whence = SEEK_SET; lock.l_start = SHARED_FIRST; lock.l_len = SHARED_SIZE; |