Merge enhancements from trunk, and in particular the WAL overwrite feature.

FossilOrigin-Name: 79125ec9d2cdb96d65ceeb19c2862665f9267d4e

diff --cc manifest
index 175a5113a91b695748e402ae7eb852cb97be362c,61584e65e46a507a5313fbbaf253397272af9c37..f7490a487e3fb0d1de1bf72b03628299f9b7b45d
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,6 -1,6 +1,6 @@@
- C Merge\sall\sversion\s3.10.0\supdates.
- D 2016-01-06T14:35:15.686
 -C If\sa\ssingle\spage\sis\swritten\sto\sthe\swal\sfile\smore\sthan\sonce,\sinstead\sof\sappending\sthe\ssecond\sand\ssubsequent\scopy\sto\sthe\swal\sfile,\soverwrite\sthe\sfirst.
 -D 2016-01-11T12:13:47.299
 -F Makefile.in 7c8cc4c2f0179efc6fa9492141d1fb65f4807054
++C Merge\senhancements\sfrom\strunk,\sand\sin\sparticular\sthe\sWAL\soverwrite\sfeature.
++D 2016-01-11T12:49:55.102
 +F Makefile.in 7b85d6e4ef59420a075d21525a58b69a97e554f1
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc e45d8b9b56dfa3f2cd860b2c28bd9d304513b042
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
@@@ -278,11 -275,11 +278,11 @@@ F src/attach.c e944d0052b577703b9b83aac
  F src/auth.c b56c78ebe40a2110fd361379f7e8162d23f92240
  F src/backup.c 2869a76c03eb393ee795416e2387005553df72bc
  F src/bitvec.c 1a78d450a17c5016710eec900bedfc5729bf9bdf
- F src/btmutex.c 45a968cc85afed9b5e6cf55bf1f42f8d18107f79
- F src/btree.c c24afbe7c9e4a3e8279d91680d9e9602588db488
- F src/btree.h 2d76dee44704c47eed323356a758662724b674a0
+ F src/btmutex.c bc87dd3b062cc26edfe79918de2200ccb8d41e73
 -F src/btree.c 6bd9b3d778a023e2238a81cd0b87b00085220e0e
++F src/btree.c cefa8e087e73b2892845b2af2dc980fafd1ac13a
+ F src/btree.h 68ef301795e00cdf1d3ab93abc44a43b7fe771e0
  F src/btreeInt.h b5f2651b41808f038dee9282c5dc0232ce6532d3
- F src/build.c d8006e9030c61b9495d0b2f724edd3fcdae16930
+ F src/build.c 9d497ff4bf3c82cecb520436e0e9963785627583
  F src/callback.c 7b44ce59674338ad48b0e84e7b72f935ea4f68b0
  F src/complete.c addcd8160b081131005d5bc2d34adf20c1c5c92f
  F src/ctime.c 60e135af364d777a9ab41c97e5e89cd224da6198
@@@ -320,34 -317,33 +320,34 @@@ F src/os.c 5822c2b843a77219bba1e28887cd
  F src/os.h 3e57a24e2794a94d3cf2342c6d9a884888cd96bf
  F src/os_common.h abdb9a191a367793268fe553d25bab894e986a0e
  F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
- F src/os_unix.c 90d83aaad8ffcbe4569a41b8fcc2821f308316cc
 -F src/os_unix.c 82986e1e75782b54da7822dca42d36d974fc2948
 -F src/os_win.c 386fba30419e8458b13209781c2af5590eab2811
++F src/os_unix.c cda640ef84f27ede61c313a5dbf09c6fc08c82ac
 +F src/os_win.c d5f32f015c52888b76c8919a8b3fa5c532dff497
  F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca
 -F src/pager.c 58d2593612acb6b542de6715b4af397ea1fa0a35
 -F src/pager.h bf25005b4656cd805af43487c3139fca9678d0cc
 +F src/pager.c 25186b68d3180891dfa849bb9c0b7cd5d370fce3
 +F src/pager.h a038f5d7d5b17a8463e312d45f92b17e6928339e
- F src/parse.y 23737e649c26ce327603799e57f5c2ff50e5e6ba
+ F src/parse.y caad1e98edeca6960493d0c60d31b76820dd7776
  F src/pcache.c 73895411fa6b7bd6f0091212feabbe833b358d23
- F src/pcache.h 1ff11adce609ba7de139b6abfabaf9a2bac947b5
+ F src/pcache.h 4d0ccaad264d360981ec5e6a2b596d6e85242545
  F src/pcache1.c 72f644dc9e1468c72922eff5904048427b817051
 -F src/pragma.c f3e7147299ca05ef4304a36f1fd6e002729c72c6
 +F src/pragma.c c1ab37e1576d22715d3bae4f51658326240a8161
  F src/pragma.h 64c78a648751b9f4f297276c4eb7507b14b4628c
 -F src/prepare.c 82e5db1013846a819f198336fed72c44c974e7b1
 +F src/prepare.c 176b060bcf36041193c2807f2b045dce1effa4bb
  F src/printf.c af589a27b7d40f6f4f704e9eea99f02f18ad6d32
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
  F src/resolve.c a83b41104e6ff69855d03cd0aaa09e93927ec39f
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
- F src/select.c f8fded11fc443a9f5a73cc5db069d06b34460e2f
+ F src/select.c d84c091185bc160c349e8bf460ebd084dbd77e64
  F src/shell.c ed71dc7679e6f087a3f1ea3f9dae4b0fae7209c3
 -F src/sqlite.h.in 7d87d71b9a4689c51fa092f48f16590ff71558e3
 +F src/sqlite.h.in 52db0e5240e6c3d355937cdc187b61999d884aff
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
 +F src/sqlite3_private.h a81a9c5f97c095cc3e86914a05f8fabe0011f4a1
  F src/sqlite3ext.h dfbe62ffd95b99afe2140d8c35b180d11924072d
- F src/sqliteInt.h 3b529e6a3771cce0f840b7a411ddb04761d96798
 -F src/sqliteInt.h b8ccd34a919e4b6bab8c4164046330002aa9a27a
++F src/sqliteInt.h da2c7b0ddb1c351ad07bd4eccfb7764bc42ab92a
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c 70912d7be68e9e2dbc4010c93d344af61d4c59ba
  F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e
- F src/tclsqlite.c d9439b6a910985b7fff43ba6756bcef00de22649
+ F src/tclsqlite.c 82979239a896992f9b78efec81cfda05d316a7d0
 -F src/test1.c 4f1b42699068b7806af3111786f5ad760c2c1ff7
 +F src/test1.c f51730220589f17d95dbd6f821e1cb6377d4554c
  F src/test2.c 5586f43fcd9a1be0830793cf9d354082c261b25b
  F src/test3.c a8887dabbbee3059af338f20d290084a63ed1b0f
  F src/test4.c d168f83cc78d02e8d35567bb5630e40dcd85ac1e
@@@ -402,19 -398,19 +402,19 @@@ F src/update.c 17332f9fe818cbc0444c36a8
  F src/utf.c 32d7f82aa921322f3e1c956f4b58f019ebd2c6b3
  F src/util.c e802e8e311a0d6c48cd1b3e89db164f6f0248d70
  F src/vacuum.c 2ddd5cad2a7b9cef7f9e431b8c7771634c6b1701
 -F src/vdbe.c 6ac8e5d808d48afc369316e147c191102f0584c1
 +F src/vdbe.c 5678e9375dca62a33726c7565e2e61ce701ea365
  F src/vdbe.h efb7a8c1459e31f3ea4377824c6a7e4cb5068637
- F src/vdbeInt.h 75c2e82ee3357e9210c06474f8d9bdf12c81105d
+ F src/vdbeInt.h 42eefa4f9e7432b9968d321b44e48821ec13b189
 -F src/vdbeapi.c 020681b943e77766b32ae1cddf86d7831b7374ca
 -F src/vdbeaux.c 5d8c7c04e0f677033efb1292248a5f9056bbc34c
 +F src/vdbeapi.c b13f483b1375467c367de486edf2be05234e27bb
- F src/vdbeaux.c 8e542577cea8be74d4fb2a11ee6d6248e12cb4c4
++F src/vdbeaux.c 7b65a9fd7475c0dd9603d2c733311692efe48157
  F src/vdbeblob.c fdc4a81605ae7a35ae94a55bd768b66d6be16f15
  F src/vdbemem.c fdd1578e47bea61390d472de53c565781d81e045
  F src/vdbesort.c a7ec02da4494c59dfd071126dd3726be5a11459d
  F src/vdbetrace.c 8befe829faff6d9e6f6e4dee5a7d3f85cc85f1a0
  F src/vtab.c 2a8b44aa372c33f6154208e7a7f6c44254549806
  F src/vxworks.h c18586c8edc1bddbc15c004fa16aeb1e1342b4fb
- F src/wal.c b08004315d7f475d44e7e09174897cc016cfdd14
 -F src/wal.c 92ca9e7923c337c497e4c9aa7edac800e269a1d8
 -F src/wal.h 907943dfdef10b583e81906679a347e0ec6f1b1b
++F src/wal.c 82dec8065d6c3d95706e193be19ef50acfb9b126
 +F src/wal.h 074df251e14dffb0ea9ce958a4328dff1a68c9d7
  F src/walker.c 2e14d17f592d176b6dc879c33fbdec4fbccaa2ba
  F src/where.c c6d3d2f6af57d574a7365ee2b225a5024f2a6bec
  F src/whereInt.h 78b6b4de94db84aecbdc07fe3e38f648eb391e9a
@@@ -1063,10 -1058,10 +1063,10 @@@ F test/table.test b708f3e5fa2542fa51dfa
  F test/tableapi.test 2674633fa95d80da917571ebdd759a14d9819126
  F test/tableopts.test dba698ba97251017b7c80d738c198d39ab747930
  F test/tclsqlite.test 7fb866443c7deceed22b63948ccd6f76b52ad054
 -F test/tempdb.test 19d0f66e2e3eeffd68661a11c83ba5e6ace9128c
 +F test/tempdb.test 3263e5c3f0604e54d307481e8587327c54544d18
  F test/temptable.test d2c9b87a54147161bcd1822e30c1d1cd891e5b30
  F test/temptrigger.test 8ec228b0db5d7ebc4ee9b458fc28cb9e7873f5e1
- F test/tester.tcl 9d9de709de13446fcc9019c6aafffcbbca2c4c71
 -F test/tester.tcl af4749cf4abf04291710c5e73f40bc8f411bae86
++F test/tester.tcl 15a496be4cc0f79401d121fdb7589b5ae00e1ec6
  F test/thread001.test 9f22fd3525a307ff42a326b6bc7b0465be1745a5
  F test/thread002.test e630504f8a06c00bf8bbe68528774dd96aeb2e58
  F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7
@@@ -1284,33 -1279,34 +1284,34 @@@ F test/vtabI.test 751b07636700dbdea328e
  F test/vtab_alter.test 9e374885248f69e251bdaacf480b04a197f125e5
  F test/vtab_err.test 0d4d8eb4def1d053ac7c5050df3024fd47a3fbd8
  F test/vtab_shared.test ea8778d5b0df200adef2ca7c00c3c37d4375f772
- F test/wal.test cfbc6bbd2cc519f6cc5c01ae7744ef78785b0957
 -F test/wal.test 65bfc68f3f09dcbc62cee9f794e560428d96cec7
 -F test/wal2.test 1f841d2048080d32f552942e333fd99ce541dada
 -F test/wal3.test b1d425f68a1f61d12563f0fa1ee6fca7d5afabf4
 -F test/wal4.test 4744e155cd6299c6bd99d3eab1c82f77db9cdb3c
 -F test/wal5.test 88b5d9a6a3d1532497ee9f4296f010d66f07e33c
 -F test/wal6.test 4421cd5a2fa99d29cc91ef12fb23bed171ed3a4c
++F test/wal.test 40cc49c5e9aac2bb8b058b0e430576d68bb02e2a
 +F test/wal2.test 703b87c21c1e3e169d607158de414c7c2655b93e
 +F test/wal3.test 80c314c403888c968bb80f3ce1be84f6e6ccfe2c
 +F test/wal4.test 5755887f321baa4c55de0b91066fa7d0cafcac9d
 +F test/wal5.test 03043461be964ff80df96d629a7f8db1a95e1b37
 +F test/wal6.test c7d532c76f9e16aec657e529184c52a6e834dae4
  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 9afeb96240296c08c72fc524d199c912cfe34daa
 -F test/walcrash.test 451d79e528add5c42764cea74aa2750754171b25
 -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 932d12a2a36fb2765560d35e7eaa1e5f0b198385
 +F test/walcrash.test 011e05e9170da888851cb9ec4276bb1894ad32e3
 +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 8702964967c2f28204f0b4f27af65da81999fc99
 -F test/walpersist.test 8c6b7e3ec1ba91b5e4dc4e0921d6d3f87cd356a6
 -F test/walro.test 34422d1d95aaff0388f0791ec20edb34e2a3ed57
 -F test/walshared.test 0befc811dcf0b287efae21612304d15576e35417
 -F test/walslow.test e7be6d9888f83aa5d3d3c7c08aa9b5c28b93609a
 -F test/walthread.test de8dbaf6d9e41481c460ba31ca61e163d7348f8e
 +F test/walpersist.test abd956d66e2f36d2d9d05d3a969f48be6d2ddbec
 +F test/walro.test 256ea9380825a34be43e8ff02bd1e240f1f62e8c
 +F test/walshared.test 04590b10c677f75318701818c50bc0dda5da64ab
 +F test/walslow.test 658066419a92d3bd85be71a11ce477af4ffe9153
 +F test/walthread.test c13f5a12fbd9d81e58f49875dc9dd8a52a84cf03
  F test/where.test 9902a3d84e9bc80357a2c54ed0e76c0d6d04a867
  F test/where2.test af78c55589cbc82d793449493adba0dc3d659f23
  F test/where3.test 1ad55ba900bd7747f98b6082e65bd3e442c5004e
@@@ -1411,7 -1407,8 +1412,7 @@@ F tool/vdbe_profile.tcl 246d0da094856d7
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 5b700f313d753a308d2c6b5e5a5ee42af2e6d180 fd0a50f0797d154fefff724624f00548b5320566
- R 917b6555389a1f5facbdef20b023e669
 -P 5dddcc78eec5bcd0c7e8fe1b70875ce775488f0c 87dae56c322454094d445e474ae36a4f464272a4
 -R 52e14e84cadc34ac79ad50b8340775a5
 -T +closed 87dae56c322454094d445e474ae36a4f464272a4
 -U dan
 -Z be438c4ccb03f7e22074fee8f0915a54
++P 77c28c2b2dc601e67a88f55afff53b6cb9a24833 d493d4f1186c15da50558a13490cba0191e6f649
++R 95df731e0279ccd54195782f9a4668dd
 +U drh
- Z a788d0588b62e2dbe90c7ae8199f5804
++Z 74e9e68d235160d66807f26cf881463c

diff --cc manifest.uuid
index 4efd5d194b2250c61c5bfcf3225dd70542c75983,5ee49b098d6d930b11e392372b99a59aab7b2a38..267b8c81e53ce2b75e6e1523d6fdd458511ac9fb
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 77c28c2b2dc601e67a88f55afff53b6cb9a24833
 -d493d4f1186c15da50558a13490cba0191e6f649
++79125ec9d2cdb96d65ceeb19c2862665f9267d4e

diff --cc src/btree.c
Simple merge

diff --cc src/os_unix.c
Simple merge

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/vdbeaux.c
Simple merge

diff --cc src/wal.c
Simple merge

diff --cc test/tester.tcl
Simple merge

diff --cc test/wal.test
index 11b5c4e83164169f1b0b72b79bea7a9121fb3892,abd3a3ce49b822d5bd8b3aa46771c4523bed4dcf..eee557388637e08be4234153dc6b3e4084cc3d26
--- 1/test/wal.test
--- 2/test/wal.test
+++ b/test/wal.test
@@@ -735,21 -722,22 +735,28 @@@ do_test wal-11.7 
  do_test wal-11.8 {
    execsql { PRAGMA wal_checkpoint }
    list [expr [file size test.db]/1024] [file size test.db-wal]
- } [list 37 [wal_file_size 41 1024]]
+ } [list 37 [wal_file_size 40 1024]]
  do_test wal-11.9 {
 +  ifcapable enable_persist_wal {
 +    file_control_persist_wal db 0
 +  }
    db close
    list [expr [file size test.db]/1024] [log_deleted test.db-wal]
  } {37 1}
  sqlite3_wal db test.db
- set nWal 39
- if {[permutation]!="mmap"} {set nWal 37}
- ifcapable !mmap {set nWal 37}
+ 
+ # After adding the capability of WAL to overwrite prior uncommitted
+ # frame in the WAL-file with revised content, the size of the WAL file
+ # following cache-spill is smaller.
+ #
+ #set nWal 39
+ #if {[permutation]!="mmap"} {set nWal 37}
+ #ifcapable !mmap {set nWal 37}
+ set nWal 34
+ 
 +ifcapable enable_persist_wal {
 +  file_control_persist_wal db 0
 +}
  do_test wal-11.10 {
    execsql {
      PRAGMA cache_size = 10;