diff options
| author | drh <drh@noemail.net> | 2015-07-14 15:39:22 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2015-07-14 15:39:22 +0000 |
| commit | 38151adfe2f51c07ca50e9cbc6f44a9811097eb1 (patch) | |
| tree | 44ecb68858c63553a92e23f56db4481f7a620327 /src/os_unix.c | |
| parent | bed6de557a5282f92ed5019d5c89129a6ece6bab (diff) | |
| parent | 201e0c68f7d5d19ba759f56fadd0d58c838c41f9 (diff) | |
| download | sqlite-38151adfe2f51c07ca50e9cbc6f44a9811097eb1.tar.gz sqlite-38151adfe2f51c07ca50e9cbc6f44a9811097eb1.zip | |
Merge trunk changes, including the addition of FTS5 and pcache1 performance
enhancements.
FossilOrigin-Name: db4cbefb8674c6cfff27c1e918741de1885c845c
Diffstat (limited to 'src/os_unix.c')
| -rw-r--r-- | src/os_unix.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/os_unix.c b/src/os_unix.c index 9ec100323..d7a94ab09 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -629,14 +629,14 @@ static int robust_open(const char *z, int f, mode_t m){ ** unixEnterLeave() */ static void unixEnterMutex(void){ - sqlite3_mutex_enter(sqlite3MutexAlloc(SQLITE_MUTEX_STATIC_MASTER)); + sqlite3_mutex_enter(sqlite3MutexAlloc(SQLITE_MUTEX_STATIC_VFS1)); } static void unixLeaveMutex(void){ - sqlite3_mutex_leave(sqlite3MutexAlloc(SQLITE_MUTEX_STATIC_MASTER)); + sqlite3_mutex_leave(sqlite3MutexAlloc(SQLITE_MUTEX_STATIC_VFS1)); } #ifdef SQLITE_DEBUG static int unixMutexHeld(void) { - return sqlite3_mutex_held(sqlite3MutexAlloc(SQLITE_MUTEX_STATIC_MASTER)); + return sqlite3_mutex_held(sqlite3MutexAlloc(SQLITE_MUTEX_STATIC_VFS1)); } #endif |