/ Check-in [d1c15de5]
Login

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

Overview
Comment:Fix the build so that it works for SQLITE_OMIT_WAL again.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | branch-3.10
Files: files | file ages | folders
SHA1: d1c15de51635d8105ac1b4947a6d8dcc82856232
User & Date: drh 2016-01-20 15:08:56
Context
2016-01-20
15:20
Fix a problem in autoconf/configure.ac causing --enable-readline to fail if libedit was not present. check-in: d4a6425f user: dan tags: branch-3.10
15:08
Fix the build so that it works for SQLITE_OMIT_WAL again. check-in: d1c15de5 user: drh tags: branch-3.10
15:05
Fix a potential use-after-free problem when compiling with SQLITE_HAS_CODEC. check-in: b94a3a37 user: drh tags: branch-3.10
2016-01-14
01:56
Fix the build so that it works for SQLITE_OMIT_WAL again. check-in: d55a557b user: drh tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/pager.c.

  5623   5623         ** exclusive lock on the database is not already held, obtain it now.
  5624   5624         */
  5625   5625         if( pPager->exclusiveMode && sqlite3WalExclusiveMode(pPager->pWal, -1) ){
  5626   5626           rc = pagerLockDb(pPager, EXCLUSIVE_LOCK);
  5627   5627           if( rc!=SQLITE_OK ){
  5628   5628             return rc;
  5629   5629           }
  5630         -        sqlite3WalExclusiveMode(pPager->pWal, 1);
         5630  +        (void)sqlite3WalExclusiveMode(pPager->pWal, 1);
  5631   5631         }
  5632   5632   
  5633   5633         /* Grab the write lock on the log file. If successful, upgrade to
  5634   5634         ** PAGER_RESERVED state. Otherwise, return an error code to the caller.
  5635   5635         ** The busy-handler is not invoked if another connection already
  5636   5636         ** holds the write-lock. If possible, the upper layer will call it.
  5637   5637         */
................................................................................
  6693   6693   }
  6694   6694   
  6695   6695   /*
  6696   6696   ** Return the file handle for the journal file (if it exists).
  6697   6697   ** This will be either the rollback journal or the WAL file.
  6698   6698   */
  6699   6699   sqlite3_file *sqlite3PagerJrnlFile(Pager *pPager){
         6700  +#if SQLITE_OMIT_WAL
         6701  +  return pPager->jfd;
         6702  +#else
  6700   6703     return pPager->pWal ? sqlite3WalFile(pPager->pWal) : pPager->jfd;
         6704  +#endif
  6701   6705   }
  6702   6706   
  6703   6707   /*
  6704   6708   ** Return the full pathname of the journal file.
  6705   6709   */
  6706   6710   const char *sqlite3PagerJournalname(Pager *pPager){
  6707   6711     return pPager->zJournal;