/ Check-in [66708685]
Login

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

Overview
Comment:Make sure the WAL file is deleted when changing to DELETE journal mode.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | apple-osx
Files: files | file ages | folders
SHA1: 66708685909fb048edab7f15e4a81d5a554d88d9
User & Date: drh 2012-05-11 00:56:28
Context
2012-05-12
14:59
Merge trunk changes with apple-osx branch. check-in: bf57f0fb user: dan tags: apple-osx
2012-05-11
00:56
Make sure the WAL file is deleted when changing to DELETE journal mode. check-in: 66708685 user: drh tags: apple-osx
2012-05-10
12:09
Merge in the legacy table constraint parsing fixes from trunk. check-in: e8770283 user: drh tags: apple-osx
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/pager.c.

6919
6920
6921
6922
6923
6924
6925






6926
6927
6928
6929
6930
6931
6932
  */
  if( rc==SQLITE_OK && pPager->pWal ){
    rc = pagerExclusiveLock(pPager);
    if( rc==SQLITE_OK ){
      rc = sqlite3WalClose(pPager->pWal, pPager->ckptSyncFlags,
                           pPager->pageSize, (u8*)pPager->pTmpSpace);
      pPager->pWal = 0;






    }
  }
  return rc;
}

#ifdef SQLITE_ENABLE_ZIPVFS
/*







>
>
>
>
>
>







6919
6920
6921
6922
6923
6924
6925
6926
6927
6928
6929
6930
6931
6932
6933
6934
6935
6936
6937
6938
  */
  if( rc==SQLITE_OK && pPager->pWal ){
    rc = pagerExclusiveLock(pPager);
    if( rc==SQLITE_OK ){
      rc = sqlite3WalClose(pPager->pWal, pPager->ckptSyncFlags,
                           pPager->pageSize, (u8*)pPager->pTmpSpace);
      pPager->pWal = 0;

      /* Ensure that the WAL file is deleted even if the PERSIST_WAL
      ** hint is enabled. */
      if( rc==SQLITE_OK ){
        rc = sqlite3OsDelete(pPager->pVfs, pPager->zWal, 0);
      }
    }
  }
  return rc;
}

#ifdef SQLITE_ENABLE_ZIPVFS
/*