/ Check-in [090db8c8]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Fix a problem in os_unix.c causing compilation failure if SQLITE_DEBUG and SQLITE_MAX_MMAP_SIZE=0 are both defined.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 090db8c81d8ca216277d11c8c4751c0a37801524
User & Date: dan 2013-10-31 18:49:58
Context
2013-11-02
11:34
A pair of sqlite3_analyzer bug fixes: (1) quote strings in the SQL at the end of the output. (2) Fix test_stat.c so that it no longer misses some overflow pages on internal index pages. check-in: 42a11e74 user: drh tags: trunk
2013-11-01
17:21
Merge all changes from trunk, and disable a pair of corruption tests that are no longer valid since sqlite_master.rootpage can now be NULL for tables. check-in: dd5d57b9 user: drh tags: omit-rowid
2013-10-31
18:49
Fix a problem in os_unix.c causing compilation failure if SQLITE_DEBUG and SQLITE_MAX_MMAP_SIZE=0 are both defined. check-in: 090db8c8 user: dan tags: trunk
06:39
Update comments in the MSVC batch build tool. check-in: 0414bb73 user: mistachkin tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/os_unix.c.

  1886   1886   ** Lower the locking level on file descriptor pFile to eFileLock.  eFileLock
  1887   1887   ** must be either NO_LOCK or SHARED_LOCK.
  1888   1888   **
  1889   1889   ** If the locking level of the file descriptor is already at or below
  1890   1890   ** the requested locking level, this routine is a no-op.
  1891   1891   */
  1892   1892   static int unixUnlock(sqlite3_file *id, int eFileLock){
         1893  +#if SQLITE_MAX_MMAP_SIZE>0
  1893   1894     assert( eFileLock==SHARED_LOCK || ((unixFile *)id)->nFetchOut==0 );
         1895  +#endif
  1894   1896     return posixUnlock(id, eFileLock, 0);
  1895   1897   }
  1896   1898   
  1897   1899   #if SQLITE_MAX_MMAP_SIZE>0
  1898   1900   static int unixMapfile(unixFile *pFd, i64 nByte);
  1899   1901   static void unixUnmapfile(unixFile *pFd);
  1900   1902   #endif