Merge version 3.14 plus some subsequent patches (including the page-cache

performance patch) from trunk.

FossilOrigin-Name: d9f8918c5b7b6c8540b3f433142e1b4aa4433885

diff --cc main.mk
Simple merge

diff --cc manifest
index 20610275e2e482cc39a355cfb3f1d9c04f6ebfb5,3d5a0dd058042cb97ef890fab303813dba2e4df1..b94ce9afa9397a44e95d97812300dcdda3d5a8c6
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,10 -1,10 +1,10 @@@
- C Fix\sa\stypo\sin\stest\sprogram\sbc_test1.c.
- D 2016-07-06T08:32:53.109
- F Makefile.in 9e816d0323e418fbc0f8b2c05fc14e0b3763d9e8
 -C Add\sthe\s"modeof=<filename>"\sURI\sparameter\sto\sos_unix.c\s-\sused\sto\sspecify\sa\sfile\sto\scopy\spermissions\sfrom\swhen\sa\snew\sdatabase\sis\screated.\sAlso\sallow\spassing\sNULL\sas\sthe\ssecond\sparameter\sto\ssqlite3rbu_vacuum().
 -D 2016-08-11T18:05:47.763
++C Merge\sversion\s3.14\splus\ssome\ssubsequent\spatches\s(including\sthe\spage-cache\nperformance\spatch)\sfrom\strunk.
++D 2016-08-11T19:12:25.266
+ F Makefile.in cfd8fb987cd7a6af046daa87daa146d5aad0e088
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
- F Makefile.msc 71b8b16cf9393f68e2e2035486ca104872558836
+ F Makefile.msc d66d0395c38571aab3804f8db0fa20707ae4609a
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
- F VERSION 5d234da9b5dae329fab75ff75884cfe0a9cb3fda
+ F VERSION 25e2e333adeff5965520bc8db999c658898c972d
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
  F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
@@@ -302,7 -309,7 +309,7 @@@ F ext/userauth/userauth.c 5fa3bdb492f48
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk 968ad49af90277060b8ec7a15915273b76ee1d4d
 -F main.mk 1883ecab643b136e8ab3fdc33785e6ea8b5ceb46
++F main.mk 67e7995f96dcb48ec0ece72901ba2cd2a2b50437
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
  F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
  F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
@@@ -314,35 -321,35 +321,35 @@@ F spec.template 86a4a43b99ebb3e75e6b9a7
  F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b
  F sqlite3.1 fc7ad8990fc8409983309bb80de8c811a7506786
  F sqlite3.pc.in 48fed132e7cb71ab676105d2a4dc77127d8c1f3a
- F src/alter.c 1bb0709b3048e24217b80ec6bd78a3e99a47c01b
+ F src/alter.c cc28ab933ae615b22add0d609794ffb6596b42ea
  F src/analyze.c 37fedc80ac966ce1745811746e68e4d8fa64c7fe
  F src/attach.c 771153bd1f4ab0b97a44a13dde2c7e5e1efeba22
- F src/auth.c b56c78ebe40a2110fd361379f7e8162d23f92240
- F src/backup.c f60f0aa55d25d853ffde53d0b0370a7bb7ee41ce
+ F src/auth.c 5c8e0f37f785f935f589496801edd19840485853
+ F src/backup.c 17cd25a36d49330df2bacd2cadf2a61f3b525976
  F src/bitvec.c 3ee4c8b2c94ed3a7377256e18199e6ff5cf33f63
  F src/btmutex.c bc87dd3b062cc26edfe79918de2200ccb8d41e73
- F src/btree.c 6deeeeffaf9d35ba847ff6953ad76fc19e69d27d
- F src/btree.h 248919b5863d041e3931702f922bae62cf613004
 -F src/btree.c 2551bd3ecb8b8988fb8b23aabadfb214dbc38e46
 -F src/btree.h 075c45707c0f8f8af118f739f36df8098a08b7da
 -F src/btreeInt.h c18b7d2a3494695133e4e60ee36061d37f45d9a5
 -F src/build.c 7c3c780b703c09314032c8f6e4e7c1d80241a818
++F src/btree.c 8872dcc869d648ccc0b95834fc7e81cf49c456f7
++F src/btree.h c23154635a447f37308865ce09b5d1dd2e9deef0
 +F src/btreeInt.h ca40607c2c9d4b4b7ded98e3d707b15c2f17f1bf
- F src/build.c 034b1b7c3d2c604a5f50d7527de1462b90d25112
++F src/build.c e3b41d597d4f6f24cee6bde1e64c648b1c3983ca
  F src/callback.c 2e76147783386374bf01b227f752c81ec872d730
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
- F src/ctime.c 60e135af364d777a9ab41c97e5e89cd224da6198
- F src/date.c 1cc9fb516ec9932c6fd4d2a0d2f8bc4480145c39
- F src/dbstat.c c845548d4346e606e2f2b7d2e714ace2b8a7dd1b
- F src/delete.c 78eb999114ec04fcf1b7d123ccedb4b5b734930e
- F src/expr.c 8796c0739b2ad091e6779253f62aad6e767e2be1
+ F src/ctime.c e77f3dc297b4b65c96da78b4ae4272fdfae863d7
+ F src/date.c 95c9a8d00767e7221a8e9a31f4e913fc8029bf6b
+ F src/dbstat.c 4f6f7f52b49beb9636ffbd517cfe44a402ba4ad0
+ F src/delete.c 4aba4214a377ce8ddde2d2e609777bcc8235200f
+ F src/expr.c 9c5eca8602f6c496e8d4eefefe2aae3d831dd510
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
- F src/fkey.c 4c0bd09e602b8ae8d36d81e31e4872d0b53c87bb
- F src/func.c ef4c18c8a66143413ce41a58d582d2c14ddf78e1
+ F src/fkey.c bc4145347595b7770f9a598cff1c848302cf5413
+ F src/func.c 29cc9acb170ec1387b9f63eb52cd85f8de96c771
  F src/global.c c45ea22aff29334f6a9ec549235ac3357c970015
  F src/hash.c 55b5fb474100cee0b901edaf203e26c970940f36
- F src/hash.h c8f3c31722cf3277d03713909761e152a5b81094
- F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
+ F src/hash.h ab34c5c54a9e9de2e790b24349ba5aab3dbb4fd4
+ F src/hwtime.h 747c1bbe9df21a92e9c50f3bbec1de841dc5e5da
  F src/insert.c 8f4e9fcbd8e95e85f15647ba8b413b18d556ec2b
  F src/legacy.c 75d3023be8f0d2b99d60f905090341a03358c58e
- F src/loadext.c 8b3a73f0624c5f7cadbd5cb89940783bee1d39a6
- F src/main.c 405d13e3a4f7c5add9fb27702ae70ed0a6e32cca
+ F src/loadext.c dd7a2b77902cc66c22555aef02e1a682554b7aec
+ F src/main.c 16c1b2114eae8804caf3a8de8cb47bf2c6d83ad3
  F src/malloc.c 1443d1ad95d67c21d77af7ae3f44678252f0efec
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c 6919bcf12f221868ea066eec27e579fed95ce98b
@@@ -357,110 -364,110 +364,110 @@@ F src/mutex_noop.c 9d4309c075ba9cc7249e
  F src/mutex_unix.c 27bb6cc49485ee46711a6580ab7b3f1402211d23
  F src/mutex_w32.c 5e6fe1c298fb5a8a15aaed4161d5759311431c17
  F src/notify.c 9711a7575036f0d3040ba61bc6e217f13a9888e7
- F src/os.c 4d83917f072ad958fba9235136fa2ed43df47905
+ F src/os.c add02933b1dce7a39a005b00a2f5364b763e9a24
  F src/os.h 8e976e59eb4ca1c0fca6d35ee803e38951cb0343
  F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
- F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
- F src/os_unix.c 8422fba2eb592fbbb2d4006b6f2a67cad8951495
- F src/os_win.c 852fc2ff6084296348ed3739c548b2cf32df394e
- F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca
- F src/pager.c 41559a2b4461a6cf4b24bedb47d4e303d02729b5
- F src/pager.h 6656436178c295d0668520739118e71a46163b8e
- F src/parse.y 2e1d371f99535ff29d1cd85052aa11cc636e21c8
- F src/pcache.c b3230ecfc7f797063fbe167f2845da363e8f07f8
- F src/pcache.h 6b865be765d1ebd06145219550b10921c7da7cc9
- F src/pcache1.c 7f51d2b541aab57596adf62db2c4bb025d34f04d
- F src/pragma.c faf42922bb7ab2f6672cb550356c1967abae3c84
+ F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586
+ F src/os_unix.c be9ca0f901a2b6c1bc93dc338f4863675180c189
+ F src/os_win.c 520f23475f1de530c435d30b67b7b15fe90874b0
+ F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
 -F src/pager.c 40928c450320da78bb4bd3ae82818f4239e19b7e
 -F src/pager.h 966d2769e76ae347c8a32c4165faf6e6cb64546d
 -F src/parse.y 99b676e6fc2f4e331ab93e76b3987cffdbd28efa
++F src/pager.c bd4867fbbe328bbb5f0669d60e3c16ac03dd776f
++F src/pager.h 3ae6549ec75fe9f36b426a274788a31b1b2b2203
++F src/parse.y e87265f23548aed30b331fb86b4712e1c13c4673
+ F src/pcache.c 5583c8ade4b05075a60ba953ef471d1c1a9c05df
+ F src/pcache.h 2cedcd8407eb23017d92790b112186886e179490
+ F src/pcache1.c 4bb7a6a5300c67d0b033d25adb509c120c03e812
+ F src/pragma.c c8b499756658cb8b82cfdbb5845c22cf11f297aa
  F src/pragma.h 64c78a648751b9f4f297276c4eb7507b14b4628c
  F src/prepare.c 22df6171aec1d86904ed2ad30c2348a5748aa04e
- F src/printf.c 63e6fb12bbe702dd664dc3703776c090383a5a26
+ F src/printf.c a5f0ca08ddede803c241266abb46356ec748ded1
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
- F src/resolve.c b8f7174e5f8c33c44ded3a25a973d0bb89228c20
- F src/rowset.c 49eb91c588a2bab36647368e031dc5b66928149d
- F src/select.c fd4a7ce2937497181063cfedb92058ac89491a5d
- F src/shell.c 14ff7f660530a52b117d110ba3390b7b2eb719b6
- F src/sqlite.h.in 9984129d86243424b765fcb3f147c697bd20bb54
+ F src/resolve.c 0392c6686586b1d4dac9a4106959f03ddd70e9aa
+ F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
+ F src/select.c f3c6e9065fb34f6a23af27ec7f1f717ffbfc2ee4
+ F src/shell.c 79dda477be6c96eba6e952a934957ad36f87acc7
+ F src/sqlite.h.in 0f7580280d1b009b507d8beec1ff0f197ba0cc99
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
- F src/sqlite3ext.h 98f72cbfe00169c39089115427d06ea05fe4b4a2
- F src/sqliteInt.h e6ac0d8f8cbb062a57882858b1deed1a7924314b
+ F src/sqlite3ext.h 8648034aa702469afb553231677306cc6492a1ae
 -F src/sqliteInt.h d6f221a5bd572df935140beda82f357c2185a77c
++F src/sqliteInt.h cf506e205f4b15618f5f0787e45d40fafc8ff42c
  F src/sqliteLimit.h c0373387c287c8d0932510b5547ecde31b5da247
- F src/status.c 70912d7be68e9e2dbc4010c93d344af61d4c59ba
+ F src/status.c a9e66593dfb28a9e746cba7153f84d49c1ddc4b1
  F src/table.c 5226df15ab9179b9ed558d89575ea0ce37b03fc9
- F src/tclsqlite.c 9c4c4589d078de37813ded708d8838b338ffb060
- F src/test1.c ee8fd5c32acb93fb6fe885ca4801cfab85f5563f
- F src/test2.c 5586f43fcd9a1be0830793cf9d354082c261b25b
- F src/test3.c 0df6f8dbb4cbaa7106397c70a271fa6a43659042
- F src/test4.c d168f83cc78d02e8d35567bb5630e40dcd85ac1e
- F src/test5.c 5a34feec76d9b3a86aab30fd4f6cc9c48cbab4c1
- F src/test6.c 2c014d4977efd6107ec9eef3dfdec56ac516f824
- F src/test7.c 9c89a4f1ed6bb13af0ed805b8d782bd83fcd57e3
- F src/test8.c fa262391d3edea6490a71bfaa8fed477ccbbac75
- F src/test9.c bea1e8cf52aa93695487badedd6e1886c321ea60
- F src/test_async.c 21e11293a2f72080eda70e1124e9102044531cd8
- F src/test_autoext.c dea8a01a7153b9adc97bd26161e4226329546e12
- F src/test_backup.c 2e6e6a081870150f20c526a2e9d0d29cda47d803
- F src/test_bestindex.c 29af3cc3b963ffe5760c85d142b9b3e5302c1e3d
- F src/test_blob.c b2551a9b5573232db5f66f292307c37067937239
- F src/test_btree.c 2e9978eca99a9a4bfa8cae949efb00886860a64f
- F src/test_config.c 5165f79b3aea5305627ac36dd7b9b5f124572da1
- F src/test_demovfs.c 0de72c2c89551629f58486fde5734b7d90758852
+ F src/tclsqlite.c bdae822f21e229b6daced15938b6343ce44ef454
+ F src/test1.c 0a0909cf7962d2359db329c08d15b90b4b6e724f
+ F src/test2.c b7174313e993754303a8b33c43df7c44b46857ab
+ F src/test3.c 1339a40be39650ae83894b6578f971dc7f96ea8a
+ F src/test4.c 18ec393bb4d0ad1de729f0b94da7267270f3d8e6
+ F src/test5.c 328aae2c010c57a9829d255dc099d6899311672d
+ F src/test6.c 55aa2775c154415dcf4ed7cd1e19a193122b3a02
+ F src/test7.c 5612e9aecf934d6df7bba6ce861fdf5ba5456010
+ F src/test8.c 4f4904721167b32f7a4fa8c7b32a07a673d6cc86
+ F src/test9.c 12e5ba554d2d1cbe0158f6ab3f7ffcd7a86ee4e5
+ F src/test_async.c 195ab49da082053fdb0f949c114b806a49ca770a
+ F src/test_autoext.c 915d245e736652a219a907909bb6710f0d587871
+ F src/test_backup.c bf5da90c9926df0a4b941f2d92825a01bbe090a0
+ F src/test_bestindex.c d23f80d334c59662af69191854c76b8d3d0c8c96
+ F src/test_blob.c a0f7ad49a0c9d4b72f693fe2a71c58d7e507174d
+ F src/test_btree.c 8b2dc8b8848cf3a4db93f11578f075e82252a274
 -F src/test_config.c 4d3d4a886416f369771d69a6dba926866deda788
++F src/test_config.c 0e3fbf51a9e56a50b80d52bba032e295fae76848
+ F src/test_demovfs.c a0c3bdd45ed044115c2c9f7779e56eafff18741e
  F src/test_devsym.c 4e58dec2602d8e139ca08659f62a62450587cb58
- F src/test_fs.c f10f840ca4f8c72e4837908bd8347ac4bcab074b
- F src/test_func.c 37453d346cfcf118774efd5bf6187f7e6a7e3254
- F src/test_hexio.c abfdecb6fa58c354623978efceb088ca18e379cd
- F src/test_init.c 66b33120ffe9cd853b5a905ec850d51151337b32
- F src/test_intarray.c 870124b95ec4c645d4eb84f15efb7133528fb1a5
- F src/test_intarray.h 9dc57417fb65bc7835cc18548852cc08cc062202
+ F src/test_fs.c ac62ce7d5c0c23aa6932891cad5746945564c91c
+ F src/test_func.c a2b4993da973b0ea60dd5d51a7066238ede8c329
+ F src/test_hexio.c 1d4469ca61ab202a1fcec6543f584d2407205e8d
+ F src/test_init.c 4413c211a94b62157ca4c145b3f27c497f03c664
+ F src/test_intarray.c 988fc61cb0ff539f4172c0d95f15287c92516f64
+ F src/test_intarray.h f3b7672f5d1056eac563c0d6ea8480a660b1475c
  F src/test_journal.c d3b83f2bcb7792c709e57abddc456a2b1818643a
  F src/test_loadext.c 337056bae59f80b9eb00ba82088b39d0f4fe6dfd
- F src/test_malloc.c 94c18e88d6df6d471a0d04ddb809f833d1739950
- F src/test_multiplex.c eafc567ebe162e36f17b5062285dfe90461cf8e9
- F src/test_multiplex.h c08e4e8f8651f0c5e0509b138ff4d5b43ed1f5d3
- F src/test_mutex.c dbdfaff8580071f2212a0deae3325a93a737819c
+ F src/test_malloc.c c05f6c40bd6c8bfe5f1718212f81fd5687f91766
+ F src/test_multiplex.c 7c5b218d855cd0505a43185d55283b3fc257c8da
+ F src/test_multiplex.h 5436d03f2d0501d04f3ed50a75819e190495b635
+ F src/test_mutex.c 7f4337ba23ee6b1d2ec81c189653608cb069926a
  F src/test_onefile.c 416f87a28d6d673352d33fc4b1c7d39db878e50f
- F src/test_osinst.c ad0233b1dabb0390e25edded4ebd79a2a61538c6
+ F src/test_osinst.c 98ef31ff03d55497829ca0f6c74a9f4e1aa48690
  F src/test_pcache.c a5cd24730cb43c5b18629043314548c9169abb00
- F src/test_quota.c 180813f43683be5725458fc1ff13ac455d8e722d
+ F src/test_quota.c 6cb9297115b551f433a9ad1741817a9831abed99
  F src/test_quota.h 2a8ad1952d1d2ca9af0ce0465e56e6c023b5e15d
- F src/test_rtree.c 43fff4c5a01576d6d213f27472598801a247890c
- F src/test_schema.c 2bdba21b82f601da69793e1f1d11bf481a79b091
+ F src/test_rtree.c 671f3fae50ff116ef2e32a3bf1fe21b5615b4b7b
+ F src/test_schema.c f575932cb6274d12147a77e13ea4b49d52408513
  F src/test_server.c a2615049954cbb9cfb4a62e18e2f0616e4dc38fe
  F src/test_sqllog.c 0d138a8180a312bf996b37fa66da5c5799d4d57b
- F src/test_superlock.c 06797157176eb7085027d9dd278c0d7a105e3ec9
- F src/test_syscall.c 268c072541162564a882c57f54a6fee12ef4a4d2
- F src/test_tclvar.c d86412527da65468ee6fa1b8607c65d0af736bc4
- F src/test_thread.c af391ec03d23486dffbcc250b7e58e073f172af9
- F src/test_vfs.c 4d02f38bfb8f7f273da7ba84bfe000f5babf206c
+ F src/test_superlock.c 4839644b9201da822f181c5bc406c0b2385f672e
+ F src/test_syscall.c 1073306ba2e9bfc886771871a13d3de281ed3939
+ F src/test_tclvar.c df9fe1213c2634687a9ca0b0bec0d2119d359ae3
+ F src/test_thread.c 911d15fb14e19c0c542bdc8aabf981c2f10a4858
+ F src/test_vfs.c f0186261a24de2671d080bcd8050732f0cb64f6e
  F src/test_vfstrace.c bab9594adc976cbe696ff3970728830b4c5ed698
  F src/test_windirent.c 8f5fada630348558d5745b334702f301da1ffc61
  F src/test_windirent.h b12055cab6227f7be10f5c19296f67c60cc5e2a5
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
  F src/threads.c 4ae07fa022a3dc7c5beb373cf744a85d3c5c6c3c
- F src/tokenize.c 3b29883b0ce4a6c6f643965b66b5ca6613178e59
- F src/treeview.c e4b41a37530a191579d3c53142cc44ee2eb99373
+ F src/tokenize.c 78c8085bc7af1922aa687f0f4bbd716821330de5
+ F src/treeview.c c56d6ddbed564efda746236b35bcbb8238daac4b
  F src/trigger.c e14840ee0c3e549e758ec9bf3e4146e166002280
- F src/update.c 3e67ab3c0814635f355fb1f8ab010a2b9e016e7d
+ F src/update.c 4f05ea8cddfa367d045e03589756c02199e8f9bd
  F src/utf.c 699001c79f28e48e9bcdf8a463da029ea660540c
  F src/util.c 810ec3f22e2d1b62e66c30fe3621ebdedd23584d
- F src/vacuum.c c1a94413f8fa9d9b2cbe3af9a89377f777be676c
- F src/vdbe.c 4f0378eb44406a6a61686dff7970fa314f0f44bd
- F src/vdbe.h 5591b5add447096e31288b5a0a78ec5d7b5c5170
- F src/vdbeInt.h ddb157974436d87652de7dc641f7191496d9a8cd
- F src/vdbeapi.c ba85b78fe08dc4a9ce747e62c89a2b4a4547e74c
- F src/vdbeaux.c 5234052cc3a3a7ea9b7e4bd05f6f827168e6b99d
- F src/vdbeblob.c c9f2f494b911c6fa34efd9803f0a10807da80f77
- F src/vdbemem.c 5cfef60e60e19cab6275d1b975bf4c791d575beb
- F src/vdbesort.c 0a8f98366ae794442e6d1ef71d9553226d885d19
- F src/vdbetrace.c f75c5455d8cf389ef86a8bfdfd3177e0e3692484
- F src/vtab.c 23b6cdfa996152d43b390504ed4a942c8caf3a00
 -F src/vacuum.c 9dd2f5d276bc6094d8f1d85ecd41b30c1a002a43
 -F src/vdbe.c ea260b61e73b11a71e70b28a8e25866e2899e5da
++F src/vacuum.c ca88e6d3f5270533dea68e21008493b10023c214
++F src/vdbe.c 75556e9cd0fefd200515133af759205e48e9fb33
+ F src/vdbe.h 67bc551f7faf04c33493892e4b378aada823ed10
+ F src/vdbeInt.h c59381049af5c7751a83456c39b80d1a6fde1f9d
+ F src/vdbeapi.c c3f6715a99995c11748ecad91d25e93fd9fc390b
 -F src/vdbeaux.c a32d79aeaa88dc2b97c261172d952d395254a055
++F src/vdbeaux.c e46568111862599cf475e7cdcbc1322551064906
+ F src/vdbeblob.c 83d2d266383157b02e2b809350bb197e89d7895b
+ F src/vdbemem.c 1ecaa5ee0caff07255f25d04e8dc88befb6f88d1
+ F src/vdbesort.c 91fda3909326860382b0ca8aa251e609c6a9d62c
+ F src/vdbetrace.c 41963d5376f0349842b5fc4aaaaacd7d9cdc0834
+ F src/vtab.c 6b3cfaff7e4397739d6b48511e777ca58c6d06d4
  F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
- F src/wal.c 69cbc05af0e81321e12b3f9c2f13c35b4a936b37
- F src/wal.h 327e94c3e366154f52a8d9be9be0ea790cc4e08c
- F src/walker.c 0f142b5bd3ed2041fc52d773880748b212e63354
- F src/where.c bae50f2f18f9e8584549a77363858623b07e4915
- F src/whereInt.h 7de94b751f088fe3fdc8cc04a491376f0900a059
- F src/wherecode.c 8fdad9fbba723df1c1e8d07e7ea8507572040340
- F src/whereexpr.c eacc0e60d029a082b4fc0cc42ea98544add1319e
 -F src/wal.c 02eeecc265f6ffd0597378f5d8ae9070b62a406a
 -F src/wal.h 6dd221ed384afdc204bc61e25c23ef7fd5a511f2
++F src/wal.c 8605bf47b9d0c0202b14b36cadb4de22ab1d4f84
++F src/wal.h 520cb6942a265ac3d172e634266329a46e8c5b70
+ F src/walker.c 2d2cc7fb0f320f7f415215d7247f3c584141ac09
+ F src/where.c 5c9df42d50888be8274a5a0eb062eb0629869bd3
+ F src/whereInt.h e5b939701a7ceffc5a3a8188a37f9746416ebcd0
+ F src/wherecode.c 99707d11907c71d289ee9553d2d1a22f1fd8ba41
+ F src/whereexpr.c 98ce9f3b8d92b6f741b9f3498f9619695739256e
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
  F test/affinity2.test a6d901b436328bd67a79b41bb0ac2663918fe3bd
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
@@@ -521,9 -528,9 +528,10 @@@ F test/backup_malloc.test 7162d604ec2b4
  F test/badutf.test d5360fc31f643d37a973ab0d8b4fb85799c3169f
  F test/badutf2.test f5bc7f2d280670ecd79b9cf4f0f1760c607fe51f
  F test/bc_common.tcl b5e42d80305be95697e6370e015af571e5333a1c
 +F test/bc_test1.c e0a092579552e066ed4ce7bcdaecfa69c4aacc8d
  F test/bestindex1.test 0cf1bd2d7b97d3a3a8c10736125274f64765c4ee
  F test/bestindex2.test 4a06b8922ab2fd09434870da8d1cdf525aaf7060
+ F test/bestindex3.test dd5fa4f483cd0356549203c4522f8c9e21cb1fc0
  F test/between.test 34d375fb5ce1ae283ffe82b6b233e9f38e84fc6c
  F test/bigfile.test aa74f4e5db51c8e54a1d9de9fa65d01d1eb20b59
  F test/bigfile2.test 1b489a3a39ae90c7f027b79110d6b4e1dbc71bfc
@@@ -569,12 -576,9 +577,13 @@@ F test/collate7.test 8ec29d98f3ee4ccebc
  F test/collate8.test cd9b3d3f999b8520ffaa7cc1647061fc5bab1334
  F test/collate9.test 3adcc799229545940df2f25308dd1ad65869145a
  F test/collateA.test b8218ab90d1fa5c59dcf156efabb1b2599c580d6
+ F test/collateB.test 8ec2accd2d7166c1eff0d2a39bc90262c6f89632
  F test/colmeta.test 2c765ea61ee37bc43bbe6d6047f89004e6508eb1
  F test/colname.test 08948a4809d22817e0e5de89c7c0a8bd90cb551b
 +F test/concfault.test 500f17c3fcfe7705114422bcc6ddd3c740001a43
 +F test/concurrent.test 634b6a88f1942f5d68cc89d4d5efa2b11ba7913c
 +F test/concurrent2.test 77d655c6af93e77803b5c926555a838bb21f922f
 +F test/concurrent3.test 0a5f7e3036d1eccf0782d7153ac21f5f222e9468
  F test/conflict.test 029faa2d81a0d1cafb5f88614beb663d972c01db
  F test/conflict2.test bb0b94cf7196c64a3cbd815c66d3ee98c2fecd9c
  F test/conflict3.test dec0634c0f31dec9a4b01c63063e939f0cd21b6b
@@@ -1130,8 -1141,9 +1145,9 @@@ F test/thread2.test f35d2106452b77523b3
  F test/thread_common.tcl 334639cadcb9f912bf82aa73f49efd5282e6cadd
  F test/threadtest1.c 6029d9c5567db28e6dc908a0c63099c3ba6c383b
  F test/threadtest2.c a70a8e94bef23339d34226eb9521015ef99f4df8
 -F test/threadtest3.c 38a612ea62854349ed66372f330a40d73c5cf956
 +F test/threadtest3.c 4b413718ab3ef5e4f9f1ab0502b89707c5a9ccdc
  F test/threadtest4.c c1e67136ceb6c7ec8184e56ac61db28f96bd2925
+ F test/time-wordcount.sh 8e0b0f8109367827ad5d58f5cc849705731e4b90
  F test/tkt-02a8e81d44.test 6c80d9c7514e2a42d4918bf87bf6bc54f379110c
  F test/tkt-26ff0c2d1e.test 888324e751512972c6e0d1a09df740d8f5aaf660
  F test/tkt-2a5629202f.test 0521bd25658428baa26665aa53ffed9367d33af2
@@@ -1491,7 -1510,7 +1515,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 d0d0bab4e92402b6af98366be6e8955588613a51
- R fd9335f42062b54523dedc8b82de076d
 -P ab83d7077da80ddbcf399d0797d79e964dc64f0e
 -R 753cf0ce0fc5b95ce832a2f13995ee3e
--U dan
- Z 5f55bfec2b6a0fc682708f8a8d6277b4
 -Z 87571942a0f33f54e925f9d7f08d0ded
++P 2c61b7ab1808d5576a21fea84c3f414db51abfa5 ed406d31ff54ee3de8db91690a966e5c561f8f94
++R 6144d43db42087097a2449fa8c85b94a
++U drh
++Z 204e3a86f7529a03a274de60935ccb45

diff --cc manifest.uuid
index aa42780861f66880fe9f6b93d725db3c2fbef302,32f13a7c5d884ecd332d6215d34f2a7992ad938b..51761e50c242d3e34549ac41e93c61b1e67a09fd
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 2c61b7ab1808d5576a21fea84c3f414db51abfa5
 -ed406d31ff54ee3de8db91690a966e5c561f8f94
++d9f8918c5b7b6c8540b3f433142e1b4aa4433885

diff --cc src/btree.c
Simple merge

diff --cc src/btree.h
index 9e4af144fd6bf8e700e52eaa019f53c302617ca1,b76e2ce2144a0d804830bfd6e60251ce0d65158a..bffaf6da43a69d25a2edde2cb70d4a6de798f347
--- 1/src/btree.h
--- 2/src/btree.h
+++ b/src/btree.h
@@@ -333,4 -358,5 +360,4 @@@ void sqlite3BtreeCursorList(Btree*)
  # define sqlite3SchemaMutexHeld(X,Y,Z) 1
  #endif
  
- #endif /* _BTREE_H_ */
 -
+ #endif /* SQLITE_BTREE_H */

diff --cc src/build.c
Simple merge

diff --cc src/pager.c
index 36a936a9c3d6c65f3afef205a329f556d3769f3c,cd8d1204b360c8d95e654fe9da7c8bf4be61401e..240bbb5f63ab11271ca82c37e6c558530ac1d7a7
--- 1/src/pager.c
--- 2/src/pager.c
+++ b/src/pager.c
@@@ -2079,14 -2033,17 +2083,16 @@@ static int pager_end_transaction(Pager 
    }
  #endif
  
 -  sqlite3BitvecDestroy(pPager->pInJournal);
 -  pPager->pInJournal = 0;
 +  pagerFreeBitvecs(pPager);
    pPager->nRec = 0;
-   if( MEMDB || pagerFlushOnCommit(pPager) ){
-     sqlite3PcacheCleanAll(pPager->pPCache);
-   }else{
-     sqlite3PcacheClearWritable(pPager->pPCache);
+   if( rc==SQLITE_OK ){
+     if( pagerFlushOnCommit(pPager, bCommit) ){
+       sqlite3PcacheCleanAll(pPager->pPCache);
+     }else{
+       sqlite3PcacheClearWritable(pPager->pPCache);
+     }
+     sqlite3PcacheTruncate(pPager->pPCache, pPager->dbSize);
    }
-   sqlite3PcacheTruncate(pPager->pPCache, pPager->dbSize);
  
    if( pagerUseWal(pPager) ){
      /* Drop the WAL write-lock, if any. Also, if the connection was in 

diff --cc src/pager.h
Simple merge

diff --cc src/parse.y
Simple merge

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/test_config.c
Simple merge

diff --cc src/vacuum.c
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc src/vdbeaux.c
Simple merge

diff --cc src/wal.c
Simple merge

diff --cc src/wal.h
Simple merge