Merge changes from trunk, especially the SQLITE_DEFAULT_SYNCHRONOUS

enhancements.

FossilOrigin-Name: 29741941238643dc0e41660d98b176d81f9fd6f1

diff --cc manifest
index 584086a5bf2e526f3af9a2879d5dd235a1e46bd4,40a77bc19ae090095364b23a1aaf65f05bd6ac6d..c38418549633f19f519d563effb838b804335e37
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,6 -1,6 +1,6 @@@
- C Merge\scoverage\simprovements\sand\scomment\sfixes\sfrom\strunk.
- D 2016-03-08T14:01:52.135
 -C Drop\ssupport\sfor\sSQLITE_EXTRA_DURABLE.\s\sThe\snew\sSQLITE_DEFAULT_SYNCHRONOUS\ncompile-time\soption\sis\sa\smore\sgeneral\sreplacement.
 -D 2016-03-08T16:07:59.373
 -F Makefile.in f53429fb2f313c099283659d0df6f20f932c861f
++C Merge\schanges\sfrom\strunk,\sespecially\sthe\sSQLITE_DEFAULT_SYNCHRONOUS\nenhancements.
++D 2016-03-08T16:35:17.731
 +F Makefile.in 3aee0ba902634c52493914df76b40cedcd99b678
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc df0bf9ff7f8b3f4dd9fb4cc43f92fe58f6ec5c66
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
@@@ -295,7 -293,7 +296,7 @@@ F src/auth.c b56c78ebe40a2110fd361379f7
  F src/backup.c f60f0aa55d25d853ffde53d0b0370a7bb7ee41ce
  F src/bitvec.c 3ee4c8b2c94ed3a7377256e18199e6ff5cf33f63
  F src/btmutex.c bc87dd3b062cc26edfe79918de2200ccb8d41e73
- F src/btree.c 975209703bd78b927cd4a0cb59ee0be5d48437b5
 -F src/btree.c 2712f087351f5c4ff0e71631b1e67b461611b99d
++F src/btree.c 1e36580a1f17f02d04e2a8dba70af6194290e9c2
  F src/btree.h a5008b9afe56e8e54ade6c436a910f112defcca9
  F src/btreeInt.h c18b7d2a3494695133e4e60ee36061d37f45d9a5
  F src/build.c 43b93fe757bfffe00f97462596418b052eefdccd
@@@ -314,9 -312,9 +315,9 @@@ F src/hash.c 4263fbc955f26c2e8cdc0cf214
  F src/hash.h c8f3c31722cf3277d03713909761e152a5b81094
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
  F src/insert.c 723d5d708cdb61bdd47c00b9f07c75be45aefc09
 -F src/legacy.c 75d3023be8f0d2b99d60f905090341a03358c58e
 +F src/legacy.c b419b813f192eef79d73f968511d2ee129525e21
  F src/loadext.c 9e2a41adcaff16ebc1ebff1f336cbf33de55396f
- F src/main.c 417bc5748033c15b75fbf6d1d95cc02fd62fee59
 -F src/main.c 29ea8ebb23ceb5159da167e18d5c807fbb1545c4
++F src/main.c aa4809ab4ca3d6260522d4be5bbe0a50eccf6032
  F src/malloc.c 1443d1ad95d67c21d77af7ae3f44678252f0efec
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c 6919bcf12f221868ea066eec27e579fed95ce98b
@@@ -335,34 -333,33 +336,34 @@@ F src/os.c 4bcb5173e2b51e254397fbed13ed
  F src/os.h 3e57a24e2794a94d3cf2342c6d9a884888cd96bf
  F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
  F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
 -F src/os_unix.c f5bac8e74aaefc4ea520e43b4540793c3b8a9e8f
 -F src/os_win.c f0d7aa603eb6262143d7169a222aea07c4fca91d
 +F src/os_unix.c 4547ba822e88bbbb4749730fb0825e8428485610
 +F src/os_win.c 390534cac9a3730d589241d4c452901bd2aaf7bd
  F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca
- F src/pager.c 685c46484f2854c5e262bca3f2cb793564ae0a46
 -F src/pager.c 2d950142528e5d9b291a1160443d7ade0d90700d
 -F src/pager.h e1d38a2f14849e219df0f91f8323504d134c8a56
++F src/pager.c 18595a8878be571377a3d84651e714c58951a16a
 +F src/pager.h ff4c0c4bdf5e0e1d6a6c004313e240822ceee4a1
  F src/parse.y 5ea8c81c5c41b27887f41b4a7e1c58470d7d3821
  F src/pcache.c 647bb53a86b7bbcf55ad88089b3ea5a9170b90df
  F src/pcache.h 4d0ccaad264d360981ec5e6a2b596d6e85242545
--F src/pcache1.c 72f644dc9e1468c72922eff5904048427b817051
- F src/pragma.c 2c1fa795a12694b4e79b7837bab6aea79040aa27
 -F src/pragma.c c7061870c235702a513ce4152fe978faf3f282eb
++F src/pcache1.c dc4ad9b31cf603d14b3a90719f3aa874b4925137
++F src/pragma.c 88bd7bba130d57ed76327154153e65cfa9002b79
  F src/pragma.h 64c78a648751b9f4f297276c4eb7507b14b4628c
 -F src/prepare.c 22df6171aec1d86904ed2ad30c2348a5748aa04e
 +F src/prepare.c 9c56ea254317e27d3a1273fa812b8578b5e2f850
  F src/printf.c 63e6fb12bbe702dd664dc3703776c090383a5a26
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
  F src/resolve.c b8f7174e5f8c33c44ded3a25a973d0bb89228c20
  F src/rowset.c 9fe4b3ad7cc00944386bb600233d8f523de07a6e
  F src/select.c 137b31daa84d57d67847bf621bb54f3353e2077b
  F src/shell.c 5e0ab1e708dc294330ccd8230536e1801f60822e
 -F src/sqlite.h.in 0235586b3fb639e85998d495c90f007657fd82af
 +F src/sqlite.h.in 427f02cf8a6e461c50f98a8663fd8f582e659456
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 +F src/sqlite3_private.h a81a9c5f97c095cc3e86914a05f8fabe0011f4a1
  F src/sqlite3ext.h dfbe62ffd95b99afe2140d8c35b180d11924072d
- F src/sqliteInt.h 16201931b2ce79b80e9de3be6520cfd22a8f39a2
 -F src/sqliteInt.h 24e2eed36a68d48bd43d866adb528001b0795275
++F src/sqliteInt.h 8c9346a756302b27b1244f6177cfd6bc33a0907d
  F src/sqliteLimit.h 7b28cf72cbd52f178bfc97ea266445e351f2cd24
  F src/status.c 70912d7be68e9e2dbc4010c93d344af61d4c59ba
  F src/table.c 5226df15ab9179b9ed558d89575ea0ce37b03fc9
  F src/tclsqlite.c 54dca4eaf3a9cb0a4b845ef54ffa99225c30a52e
- F src/test1.c c2ee2401b72cbde410d02a75be6d495b91c06f25
 -F src/test1.c f14a6f9e2cff6cba4d83e2b0c52857f61886cead
++F src/test1.c e0f186189b3eb8994e25430ba271e15ece38e433
  F src/test2.c 5586f43fcd9a1be0830793cf9d354082c261b25b
  F src/test3.c a8887dabbbee3059af338f20d290084a63ed1b0f
  F src/test4.c d168f83cc78d02e8d35567bb5630e40dcd85ac1e
@@@ -377,7 -374,7 +378,7 @@@ F src/test_backup.c 2e6e6a081870150f20c
  F src/test_bestindex.c 29af3cc3b963ffe5760c85d142b9b3e5302c1e3d
  F src/test_blob.c b2551a9b5573232db5f66f292307c37067937239
  F src/test_btree.c 2e9978eca99a9a4bfa8cae949efb00886860a64f
- F src/test_config.c f569bb9c62cb98ffc7968d7f557703197fb4027e
 -F src/test_config.c 0dee90328e3dedf8ba002ee94b6a7e7ea7726fe4
++F src/test_config.c 4126b74fe80e74313cccdad2ac72514614dfed13
  F src/test_demovfs.c 0de72c2c89551629f58486fde5734b7d90758852
  F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc
  F src/test_fs.c f10f840ca4f8c72e4837908bd8347ac4bcab074b
@@@ -429,8 -426,8 +430,8 @@@ F src/vdbesort.c 307460bfa4de4d1c3901fc
  F src/vdbetrace.c f75c5455d8cf389ef86a8bfdfd3177e0e3692484
  F src/vtab.c fd69fd398e23e57ea4ea377d8a44b6998fc569c7
  F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
- F src/wal.c 0eaa33b32c3aa8e8d956cdd4693c4d8604966633
 -F src/wal.c 10deb6b43887662691e5f53d10b3c171c401169b
 -F src/wal.h 2f7c831cf3b071fa548bf2d5cac640846a7ff19c
++F src/wal.c c09752cafff70ccac871bd53dd7adc9b7331c919
 +F src/wal.h 29c2a284ddd9c665199273dadc7255a227092291
  F src/walker.c 0f142b5bd3ed2041fc52d773880748b212e63354
  F src/where.c dff52f7f0842430f80a7017c7859124685b08453
  F src/whereInt.h 93297d56edd137b7ea004490690fb6e2ce028a34
@@@ -1306,35 -1302,35 +1307,35 @@@ F test/vtabI.test 751b07636700dbdea328e
  F test/vtab_alter.test 9e374885248f69e251bdaacf480b04a197f125e5
  F test/vtab_err.test 0d4d8eb4def1d053ac7c5050df3024fd47a3fbd8
  F test/vtab_shared.test 5253bff2355a9a3f014c15337da7e177ab0ef8ad
 -F test/wal.test 0148c8b3421a25fdb4d9c160e84a681d0646371b
 -F test/wal2.test 25ae059e900dbb584e0775627e45415ba5940df1
 -F test/wal3.test 5dd734147f1f8f958c5261a1f2775d346d7013ce
 -F test/wal4.test 4744e155cd6299c6bd99d3eab1c82f77db9cdb3c
 -F test/wal5.test 88b5d9a6a3d1532497ee9f4296f010d66f07e33c
 -F test/wal6.test a9d6aa635b9d63607dabdc11406f5f96ca986635
 +F test/wal.test 21c1bc3ca769350746cbaf0ba02119bc61e9c4ec
- F test/wal2.test 703b87c21c1e3e169d607158de414c7c2655b93e
- F test/wal3.test 57b138012b14307e7d6298092db7f3632d360653
++F test/wal2.test 7373f2079caaa3cd7648ad78b915d6253e87647a
++F test/wal3.test 3f0fd7eae5969f5ad65a16fe6b50be444f16a6e5
 +F test/wal4.test 5755887f321baa4c55de0b91066fa7d0cafcac9d
 +F test/wal5.test 03043461be964ff80df96d629a7f8db1a95e1b37
 +F test/wal6.test 557fab4cc02b4ce2adf1d0f8821cb8acdaa1304f
  F test/wal64k.test 163655ecd2cb8afef4737cac2a40fdd2eeaf20b8
 -F test/wal7.test 2ae8f427d240099cc4b2dfef63cff44e2a68a1bd
 -F test/wal8.test 75c42e1bc4545c277fed212f8fc9b7723cd02216
 +F test/wal7.test 18cf68ab8010ae0a2baaa48e5b59567a9503e63e
 +F test/wal8.test c35dd183708148120928dca908641c361f58062c
  F test/wal9.test 378e76a9ad09cd9bee06c172ad3547b0129a6750
 -F test/wal_common.tcl a98f17fba96206122eff624db0ab13ec377be4fe
 -F test/walbak.test b9f68e39646375c2b877be906babcc15d38b4877
 -F test/walbig.test f437473a16cfb314867c6b5d1dbcd519e73e3434
 +F test/wal_common.tcl 15f152fd55703975878741beca6cfa4209d5b3b3
 +F test/walbak.test 67339b9e54db0cdaaf21287349bc8056e2919f96
 +F test/walbig.test 3ca3d94751b80054eed5bda20a1339ae1f619483
  F test/walblock.test be48f3a75eff0b4456209f26b3ce186c2015497d
 -F test/walcksum.test bb234a1bb42248b3515d992b719708015c384278
 -F test/walcrash.test 21038858cc552077b0522f50b0fa87e38139306a
 -F test/walcrash2.test a0edab4e5390f03b99a790de89aad15d6ec70b36
 -F test/walcrash3.test e426aa58122d20f2b9fbe9a507f9eb8cab85b8af
 -F test/walfault.test 1f8389f7709877e9b4cc679033d71d6fe529056b
 -F test/walhook.test ed00a40ba7255da22d6b66433ab61fab16a63483
 -F test/walmode.test 4022fe03ae6e830583672caa101f046438a0473c
 -F test/walnoshm.test 84ca10c544632a756467336b7c3b864d493ee496
 +F test/walcksum.test add42a54d7c7d9bc72a913792022a195293bef2b
 +F test/walcrash.test 065a041da88f980df3830f09b7fe308337bb594a
 +F test/walcrash2.test 6eb6842d34cc5955726264c80566963c32a9cbea
 +F test/walcrash3.test 279640ffafa23f7564529ccd69bfb97849ccae9d
 +F test/walfault.test f4160abd02d583d06d7ea9554e7a3f749f6b3410
 +F test/walhook.test 5d2bdb04fd3e220e2f96e6b566d57e00020bdaec
 +F test/walmode.test aa45339b4afa435dde5d88e71a95459cc221a3f4
 +F test/walnoshm.test 559b878f3aab838971d820329ca35f1caa7b038e
  F test/waloverwrite.test dad2f26567f1b45174e54fbf9a8dc1cb876a7f03
 -F test/walpersist.test 8c6b7e3ec1ba91b5e4dc4e0921d6d3f87cd356a6
 +F test/walpersist.test abd956d66e2f36d2d9d05d3a969f48be6d2ddbec
  F test/walprotocol.test 059cb75484a1ecf6357a2c1b3324b8156749221e
 -F test/walro.test 34422d1d95aaff0388f0791ec20edb34e2a3ed57
 -F test/walshared.test 0befc811dcf0b287efae21612304d15576e35417
 -F test/walslow.test c05c68d4dc2700a982f89133ce103a1a84cc285f
 -F test/walthread.test de8dbaf6d9e41481c460ba31ca61e163d7348f8e
 +F test/walro.test 256ea9380825a34be43e8ff02bd1e240f1f62e8c
 +F test/walshared.test 04590b10c677f75318701818c50bc0dda5da64ab
 +F test/walslow.test 07a51cbe9d4895d0a90c7af76d14a62d363ac162
 +F test/walthread.test c13f5a12fbd9d81e58f49875dc9dd8a52a84cf03
  F test/where.test f0c325563acde44f2c4ea6ba348e9e29f7121757
  F test/where2.test af78c55589cbc82d793449493adba0dc3d659f23
  F test/where3.test 1ad55ba900bd7747f98b6082e65bd3e442c5004e
@@@ -1459,7 -1455,7 +1460,7 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P 9f31516c5dd4a3578fb66d00425fb3e44d792716 3a65a1fc0fd2408c6984153801ec5dcd5211c897
- R 6c7d52d1d6603043ea540365231068b7
 -P 2179a106e8dd7943d4f37093e65ce7826720904e
 -R 82b2467863d1f8153e3f75a5d4f56472
++P 58023bfccce40c611791c1963d47b620ffb9447a f6d3156ba9af1da517dd77c1df03fa7869888463
++R 36723552f7c038204b97cfe93a212e72
  U drh
- Z b23708b1ef3d7edf4a5630564fc6396f
 -Z ded4eae64cbc81643a193c9cf7561702
++Z 03e62dca0a3e19f8c31fdfa6d9f10928

diff --cc manifest.uuid
index e6e42253db9a1626cd9ed44ddc9a7d8b5596a9ad,d7438755d183581874da5c87bf961b9290be1189..bc75543d7caf439fcdb86b7382a66945e52e6241
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 58023bfccce40c611791c1963d47b620ffb9447a
 -f6d3156ba9af1da517dd77c1df03fa7869888463
++29741941238643dc0e41660d98b176d81f9fd6f1

diff --cc src/btree.c
Simple merge

diff --cc src/main.c
Simple merge

diff --cc src/pager.c
Simple merge

diff --cc src/pcache1.c
index 7147f6a7a86b75c9754aa7301305b32f151cf2a3,7147f6a7a86b75c9754aa7301305b32f151cf2a3..b5771a7e4069da1650c4dc115635013b23536086
--- 1/src/pcache1.c
--- 2/src/pcache1.c
+++ b/src/pcache1.c
@@@ -348,7 -348,7 +348,6 @@@ static void *pcache1Alloc(int nByte)
  ** Free an allocated buffer obtained from pcache1Alloc().
  */
  static void pcache1Free(void *p){
--  int nFreed = 0;
    if( p==0 ) return;
    if( SQLITE_WITHIN(p, pcache1.pStart, pcache1.pEnd) ){
      PgFreeslot *pSlot;
@@@ -365,10 -365,10 +364,12 @@@
      assert( sqlite3MemdebugHasType(p, MEMTYPE_PCACHE) );
      sqlite3MemdebugSetType(p, MEMTYPE_HEAP);
  #ifndef SQLITE_DISABLE_PAGECACHE_OVERFLOW_STATS
--    nFreed = sqlite3MallocSize(p);
--    sqlite3_mutex_enter(pcache1.mutex);
--    sqlite3StatusDown(SQLITE_STATUS_PAGECACHE_OVERFLOW, nFreed);
--    sqlite3_mutex_leave(pcache1.mutex);
++    {
++      int nFreed = sqlite3MallocSize(p);
++      sqlite3_mutex_enter(pcache1.mutex);
++      sqlite3StatusDown(SQLITE_STATUS_PAGECACHE_OVERFLOW, nFreed);
++      sqlite3_mutex_leave(pcache1.mutex);
++    }
  #endif
      sqlite3_free(p);
    }

diff --cc src/pragma.c
Simple merge

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/test1.c
index e21920fd66231c3f4d11bfc915ce9cd85d303ad6,744b400b2a9118dc82d313ee0f7507e0e8282495..d0cf44466bdf34410837f24f1f6c2ee5fbd90adb
--- 1/src/test1.c
--- 2/src/test1.c
+++ b/src/test1.c
@@@ -1902,8 -1902,8 +1902,10 @@@ static int test_load_extension
    sqlite3 *db;
    int rc;
    char *zDb;
++#ifndef SQLITE_OMIT_LOAD_EXTENSION
    char *zFile;
    char *zProc = 0;
++#endif
    char *zErr = 0;
  
    if( objc!=4 && objc!=3 ){
@@@ -1911,10 -1911,10 +1913,12 @@@
      return TCL_ERROR;
    }
    zDb = Tcl_GetString(objv[1]);
++#ifndef SQLITE_OMIT_LOAD_EXTENSION
    zFile = Tcl_GetString(objv[2]);
    if( objc==4 ){
      zProc = Tcl_GetString(objv[3]);
    }
++#endif
  
    /* Extract the C database handle from the Tcl command name */
    if( !Tcl_GetCommandInfo(interp, zDb, &cmdInfo) ){

diff --cc src/test_config.c
index 7892640c3de53a9293f2a3283ab7a944dcdeb0ac,30b421e00b693566d26a09c18afa0ba9ae970051..8eebc5759e53cad9ac90594650b73436241ebd20
--- 1/src/test_config.c
--- 2/src/test_config.c
+++ b/src/test_config.c
@@@ -555,27 -555,7 +555,21 @@@ Tcl_SetVar2(interp, "sqlite_options", "
  #else
    Tcl_SetVar2(interp,"sqlite_options","prefer_proxy_locking","0",TCL_GLOBAL_ONLY);
  #endif
 -    
 +#if defined(SQLITE_ENABLE_PURGEABLE_PCACHE) && defined(__APPLE__)
 +  Tcl_SetVar2(interp,"sqlite_options","enable_purgeable_pcache","1",TCL_GLOBAL_ONLY);
 +#else
 +  Tcl_SetVar2(interp,"sqlite_options","enable_purgeable_pcache","0",TCL_GLOBAL_ONLY);
 +#endif
 +#if SQLITE_DEFAULT_CKPTFULLFSYNC
 +  Tcl_SetVar2(interp,"sqlite_options","default_ckptfullfsync","1",TCL_GLOBAL_ONLY);
 +#else
 +  Tcl_SetVar2(interp,"sqlite_options","default_ckptfullfsync","0",TCL_GLOBAL_ONLY);
 +#endif
- #if SQLITE_DEFAULT_WAL_SAFETYLEVEL
-   Tcl_SetVar2(interp,"sqlite_options","default_wal_safetylevel",
-               STRINGVALUE(SQLITE_DEFAULT_WAL_SAFETYLEVEL),TCL_GLOBAL_ONLY);
- #else
-   Tcl_SetVar2(interp,"sqlite_options","default_wal_safetylevel","0",TCL_GLOBAL_ONLY);
- #endif
 +#if SQLITE_ENABLE_PERSIST_WAL
 +  Tcl_SetVar2(interp,"sqlite_options","enable_persist_wal","1",TCL_GLOBAL_ONLY);
 +#else
 +  Tcl_SetVar2(interp,"sqlite_options","enable_persist_wal","0",TCL_GLOBAL_ONLY);
 +#endif
      
  #ifdef SQLITE_OMIT_SHARED_CACHE
    Tcl_SetVar2(interp, "sqlite_options", "shared_cache", "0", TCL_GLOBAL_ONLY);

diff --cc src/wal.c
index bf11aba6d23f8d468f7cc77c4533b50b0e72576e,bbac1bd6d08a82f33f20bff3cf58ece8cb5a2975..dd1d0aaee65d93403a7ec8792114679111c6c2cf
--- 1/src/wal.c
--- 2/src/wal.c
+++ b/src/wal.c
@@@ -2889,14 -2878,7 +2889,12 @@@ static int walWriteOneFrame
  ){
    int rc;                         /* Result code from subfunctions */
    void *pData;                    /* Data actually written */
-   void *aFrame;
- 
-   aFrame = p->aFrameBuf;
 +#if defined(SQLITE_WRITE_WALFRAME_PREBUFFERED)
++  u8 *aFrame = p->aFrameBuf;
 +#else
    u8 aFrame[WAL_FRAME_HDRSIZE];   /* Buffer to assemble frame-header in */
 +#endif
 +  
  #if defined(SQLITE_HAS_CODEC)
    if( (pData = sqlite3PagerCodec(pPage))==0 ) return SQLITE_NOMEM_BKPT;
  #else

diff --cc test/wal2.test
index bac0685e439513c511a36ad544bc8e56a1ba9c90,4b9bbf315f17847e6768e16782557a1c947eb902..6b871a11162d9d37a472d14700609eb85f7513fd
--- 1/test/wal2.test
--- 2/test/wal2.test
+++ b/test/wal2.test
@@@ -1241,11 -1204,6 +1241,8 @@@ foreach {tn sql reslist} 
    set sqlite_sync_count 0
    set sqlite_fullsync_count 0
  
-   if $::sqlite_options(default_wal_safetylevel) {
-     set useres $altreslist
-   }
 +  set useres $reslist
 +
    do_execsql_test wal2-14.$tn.2 {
      PRAGMA wal_autocheckpoint = 10;
      CREATE TABLE t1(a, b);                -- 2 wal syncs

diff --cc test/wal3.test
index f0fdf8819dac90f753c256a6801545eb1cc8e430,da3d31877395fb1546bac9e74fa2d43b01aa94ec..fd53a21cdad178a754fc62d8a9ba9cb377f3e72a
--- 1/test/wal3.test
--- 2/test/wal3.test
+++ b/test/wal3.test
@@@ -215,11 -211,6 +212,8 @@@ foreach {tn syncmode synccount} 
      foreach {method filename id flags} $args break
      lappend ::syncs [file tail $filename] $flags
    }
-   if $::sqlite_options(default_wal_safetylevel) {
-     set usecount $altsynccount
-   }
 +  set usecount $synccount
 +
    do_test wal3-3.$tn {
      forcedelete test.db test.db-wal test.db-journal