/ Check-in [028ed861]
Login

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

Overview
Comment:Fix an assert() in os_unix.c that is not true when using RBU.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 028ed8618af012b51104a06cc155b45d98bc4ff833d4431b9c38fd6851a74e82
User & Date: dan 2018-09-12 20:32:19
Context
2018-09-13
13:17
Fix a requirement mark on a test script. No changes to code. check-in: 628d5c0a user: drh tags: trunk
2018-09-12
20:32
Fix an assert() in os_unix.c that is not true when using RBU. check-in: 028ed861 user: dan tags: trunk
15:51
Restrict the scope of internal-use functions in alter.c. check-in: 4396914f user: drh tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/os_unix.c.

  4875   4875   ** any load or store begun after the barrier.
  4876   4876   */
  4877   4877   static void unixShmBarrier(
  4878   4878     sqlite3_file *fd                /* Database file holding the shared memory */
  4879   4879   ){
  4880   4880     UNUSED_PARAMETER(fd);
  4881   4881     sqlite3MemoryBarrier();         /* compiler-defined memory barrier */
  4882         -  assert( unixFileMutexNotheld((unixFile*)fd) );
         4882  +  assert( fd->pMethods->xLock==nolockLock 
         4883  +       || unixFileMutexNotheld((unixFile*)fd) 
         4884  +  );
  4883   4885     unixEnterMutex();               /* Also mutex, for redundancy */
  4884   4886     unixLeaveMutex();
  4885   4887   }
  4886   4888   
  4887   4889   /*
  4888   4890   ** Close a connection to shared-memory.  Delete the underlying 
  4889   4891   ** storage if deleteFlag is true.