/ Check-in [e0687582]
Login

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

Overview
Comment:Fix an assert that fired incorrectly when PRAGMA omit_readlock was set.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: e068758222bcd3f2367e9346f7154780cd395ddd
User & Date: shaneh 2010-11-09 20:33:34
Context
2010-11-12
15:49
Change the test_multiplex.c code to use wrapper functions for all sqlite3_vfs methods (instead of copying function pointers from the underlying vfs into the multiplex vfs). This is required to work with test_osinst.c. check-in: 1244ef9f user: dan tags: trunk
2010-11-09
20:33
Fix an assert that fired incorrectly when PRAGMA omit_readlock was set. check-in: e0687582 user: shaneh tags: trunk
2010-11-08
19:16
Changes to the multiplex VFS to optionally (compiler define) allow the "chunk extension" to overwrite the right-most chars of the filename instead of simply being appended. check-in: 07da0a0b user: shaneh tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/pager.c.

  6567   6567   ** lock on the database file and use heap-memory to store the wal-index
  6568   6568   ** in. Otherwise, use the normal shared-memory.
  6569   6569   */
  6570   6570   static int pagerOpenWal(Pager *pPager){
  6571   6571     int rc = SQLITE_OK;
  6572   6572   
  6573   6573     assert( pPager->pWal==0 && pPager->tempFile==0 );
  6574         -  assert( pPager->eLock==SHARED_LOCK || pPager->eLock==EXCLUSIVE_LOCK );
         6574  +  assert( pPager->eLock==SHARED_LOCK || pPager->eLock==EXCLUSIVE_LOCK || pPager->noReadlock);
  6575   6575   
  6576   6576     /* If the pager is already in exclusive-mode, the WAL module will use 
  6577   6577     ** heap-memory for the wal-index instead of the VFS shared-memory 
  6578   6578     ** implementation. Take the exclusive lock now, before opening the WAL
  6579   6579     ** file, to make sure this is safe.
  6580   6580     */
  6581   6581     if( pPager->exclusiveMode ){