diff options
| author | drh <drh@noemail.net> | 2015-09-30 14:50:39 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2015-09-30 14:50:39 +0000 |
| commit | 32af5eda6a6bd8afaad724fa61166ee92f935af5 (patch) | |
| tree | ddf5f23f29daccf300fa9d0188a7a766dfcd560e /src/mutex_unix.c | |
| parent | 9ec0efd946b8015f8b3ba3b726bc39f0b15d306c (diff) | |
| parent | 105865acf9644a66cc73a84dde72937b83dd5315 (diff) | |
| download | sqlite-32af5eda6a6bd8afaad724fa61166ee92f935af5.tar.gz sqlite-32af5eda6a6bd8afaad724fa61166ee92f935af5.zip | |
Merge recent enhancements from trunk, and especially the fix for
ticket [1b266395d6bc10].
FossilOrigin-Name: b2face9aa95ade96a5666c70b6b31064c1ad0977
Diffstat (limited to 'src/mutex_unix.c')
| -rw-r--r-- | src/mutex_unix.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/mutex_unix.c b/src/mutex_unix.c index cebb96c90..dbdaa225b 100644 --- a/src/mutex_unix.c +++ b/src/mutex_unix.c @@ -81,7 +81,9 @@ static int pthreadMutexNotheld(sqlite3_mutex *p){ #endif /* -** Try to provide a memory barrier operation, needed for initialization only. +** Try to provide a memory barrier operation, needed for initialization +** and also for the implementation of xShmBarrier in the VFS in cases +** where SQLite is compiled without mutexes. */ void sqlite3MemoryBarrier(void){ #if defined(SQLITE_MEMORY_BARRIER) |