diff options
| author | dan <dan@noemail.net> | 2018-09-12 20:32:19 +0000 |
|---|---|---|
| committer | dan <dan@noemail.net> | 2018-09-12 20:32:19 +0000 |
| commit | a86acc213226b5c575dfbed70723eb957ac2a450 (patch) | |
| tree | 4cb51dfb1449371f30c2d23755b494091bd1ebec /src/os_unix.c | |
| parent | 16b870d8040290f84bbd99061b5cdc746ebca117 (diff) | |
| download | sqlite-a86acc213226b5c575dfbed70723eb957ac2a450.tar.gz sqlite-a86acc213226b5c575dfbed70723eb957ac2a450.zip | |
Fix an assert() in os_unix.c that is not true when using RBU.
FossilOrigin-Name: 028ed8618af012b51104a06cc155b45d98bc4ff833d4431b9c38fd6851a74e82
Diffstat (limited to 'src/os_unix.c')
| -rw-r--r-- | src/os_unix.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/os_unix.c b/src/os_unix.c index a15592ef3..f4c0570cc 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -4879,7 +4879,9 @@ static void unixShmBarrier( ){ UNUSED_PARAMETER(fd); sqlite3MemoryBarrier(); /* compiler-defined memory barrier */ - assert( unixFileMutexNotheld((unixFile*)fd) ); + assert( fd->pMethods->xLock==nolockLock + || unixFileMutexNotheld((unixFile*)fd) + ); unixEnterMutex(); /* Also mutex, for redundancy */ unixLeaveMutex(); } |