SQLite

Check-in [8f05e1402d]
Login

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

Overview
Comment:Fix the build when SQLITE_ENABLE_DATA_PROTECTION is defined.
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | apple-osx
Files: files | file ages | folders
SHA1: 8f05e1402d0d26684bd15ffdb638d0a55abdce7f
User & Date: drh 2016-05-03 02:43:50.717
Context
2016-05-16
13:37
Merge recent fixes from trunk. (check-in: 0d9b82afea user: drh tags: apple-osx)
2016-05-03
02:43
Fix the build when SQLITE_ENABLE_DATA_PROTECTION is defined. (check-in: 8f05e1402d user: drh tags: apple-osx)
2016-05-02
15:00
Merge enhancements and bug fixes from trunk. (check-in: f52765ee7b user: drh tags: apple-osx)
Changes
Unified Diff Ignore Whitespace Patch
Changes to src/pager.c.
︙︙
5612
5613
5614
5615
5616
5617
5618
5619
5620
5621
5622
5623
5624
5625
5626

      if( pPager->journalMode==PAGER_JOURNALMODE_MEMORY ){
        sqlite3MemJournalOpen(pPager->jfd);
      }else{
        int flags = SQLITE_OPEN_READWRITE|SQLITE_OPEN_CREATE;
        int nSpill;

#if SQLITE_ENABLE_DATA_PROTECTION
        flags |= (pPager->vfsFlags&SQLITE_OPEN_FILEPROTECTION_MASK)|
#endif
        if( pPager->tempFile ){
          flags |= (SQLITE_OPEN_DELETEONCLOSE|SQLITE_OPEN_TEMP_JOURNAL);
          nSpill = sqlite3Config.nStmtSpill;
        }else{
          flags |= SQLITE_OPEN_MAIN_JOURNAL;
          nSpill = jrnlBufferSize(pPager);








|








5612
5613
5614
5615
5616
5617
5618
5619
5620
5621
5622
5623
5624
5625
5626

      if( pPager->journalMode==PAGER_JOURNALMODE_MEMORY ){
        sqlite3MemJournalOpen(pPager->jfd);
      }else{
        int flags = SQLITE_OPEN_READWRITE|SQLITE_OPEN_CREATE;
        int nSpill;

#if SQLITE_ENABLE_DATA_PROTECTION
        flags |= (pPager->vfsFlags&SQLITE_OPEN_FILEPROTECTION_MASK);
#endif
        if( pPager->tempFile ){
          flags |= (SQLITE_OPEN_DELETEONCLOSE|SQLITE_OPEN_TEMP_JOURNAL);
          nSpill = sqlite3Config.nStmtSpill;
        }else{
          flags |= SQLITE_OPEN_MAIN_JOURNAL;
          nSpill = jrnlBufferSize(pPager);
︙︙