Merge all recent trunk enhancements and fixes into the begin-concurrent branch.

FossilOrigin-Name: c63c1e15f8cc8981aa4dbec82d510ed70cd09797

diff --cc manifest
index 30b857880904abc5a6d5752e13b7a29a14117f11,54da3e34203fed26268a36e564bb8b0320598d9c..3e6b8b92676b69578c2e545ae1953a98f67961f0
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Merge\senhancements\sfrom\strunk.
- D 2015-09-15T19:16:47.192
 -C Strengthen\sthe\simplementations\sof\sxShmMemoryBarrier\son\sboth\sthe\sunix\sand\nwindows\sVFSes,\sso\sthat\sthey\slikely\swork\seven\sif\sSQLITE_THREADSAFE=0\sis\sused.
 -D 2015-09-24T12:40:43.573
++C Merge\sall\srecent\strunk\senhancements\sand\sfixes\sinto\sthe\sbegin-concurrent\sbranch.
++D 2015-09-24T15:17:54.922
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in f85066ce844a28b671aaeeff320921cd0ce36239
+ F Makefile.in e1afa6fb2de2bddd50e0ddae8166c2ee9d69b301
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc b268d8be2e800b9d35f074b1ed6b2f698deebdd6
+ F Makefile.msc f090cdf036f3c07fb13aa2f4494e388c0b1ed1e4
  F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION ccfc4d1576dbfdeece0a4372a2e6a2e37d3e7975
@@@ -279,13 -279,13 +279,13 @@@ F src/alter.c 4911e1f18fc11b60edbc64106
  F src/analyze.c 4c308880cf53c558070cb8513bdff4ffb1a38a77
  F src/attach.c e944d0052b577703b9b83aac1638452ff42a8395
  F src/auth.c b56c78ebe40a2110fd361379f7e8162d23f92240
- F src/backup.c 4d9134dc988a87838c06056c89c0e8c4700a0452
+ F src/backup.c c3a9c4209439b806c44cf30daf466955727bf46c
  F src/bitvec.c d1f21d7d91690747881f03940584f4cc548c9d3d
  F src/btmutex.c 45a968cc85afed9b5e6cf55bf1f42f8d18107f79
- F src/btree.c 1c1519fcf31dbcd760568a506934c59d453345fb
 -F src/btree.c 164583151135a3764672c2c25aa8e4fa06bdb12b
 -F src/btree.h 40189aefdc2b830d25c8b58fd7d56538481bfdd7
 -F src/btreeInt.h 8177c9ab90d772d6d2c6c517e05bed774b7c92c0
 -F src/build.c 8a86f4203ac8a9ac0734f242a96f043edffb6018
++F src/btree.c 82ba91898af438372d2cac20c16549ad36eef2bd
 +F src/btree.h cd4946a0a00f84e974a10ffd09d53cfbfab758f6
 +F src/btreeInt.h df0e92901c6fbb01aa8fab3cfbcdaaba2654fd04
 +F src/build.c a5b54106a7f81235ce55e0440cfb441b8c075793
  F src/callback.c 7b44ce59674338ad48b0e84e7b72f935ea4f68b0
  F src/complete.c addcd8160b081131005d5bc2d34adf20c1c5c92f
  F src/ctime.c 5a0b735dc95604766f5dac73973658eef782ee8b
@@@ -324,28 -324,28 +324,28 @@@ F src/os.c 8fd25588eeba74068d41102d2681
  F src/os.h 3e57a24e2794a94d3cf2342c6d9a884888cd96bf
  F src/os_common.h abdb9a191a367793268fe553d25bab894e986a0e
  F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
- F src/os_unix.c 76f493ed71c4154338049dee1bf6e47f69c74a55
- F src/os_win.c 40b3af7a47eb1107d0d69e592bec345a3b7b798a
+ F src/os_unix.c fc93d55f96bb978f0b0168c6ea7d6fc60b0e172c
+ F src/os_win.c 1716291e5ec2dbfc5a1fe0b32182030f1f7d8acf
  F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca
- F src/pager.c 06e10a0b736ba22df52e0f56fa67a42de41a0445
- F src/pager.h 244606cccd4293a2bc4be20bb37bf730028c5c18
 -F src/pager.c 2fbeeba28f4e6d08a15bc106f36c43346a81f09e
 -F src/pager.h ac213f8143ebfee6a8bfb91cf4ca02c9a83343c5
 -F src/parse.y f599aa5e871a493330d567ced93de696f61f48f7
++F src/pager.c 13780cd829f48fbb4cbedc76b4d9185315861ea3
++F src/pager.h 4d9e5ec29e44f32cf5e8bdad464e67a1c5a53d29
 +F src/parse.y 0dcce0ae4e106cdaad4053f73b3bc2dedca9c6d6
  F src/pcache.c 24be750c79272e0ca7b6e007bc94999700f3e5ef
  F src/pcache.h 9968603796240cdf83da7e7bef76edf90619cea9
- F src/pcache1.c a0c0bb29f7bd720743a16a95eb5dedba3ade15bc
+ F src/pcache1.c e822007159d53a7ea7aa040d6e28964ddb6de083
  F src/pragma.c d71b813e67bf03f3116b9dd5164fbfd81ec673a2
  F src/pragma.h 631a91c8b0e6ca8f051a1d8a4a0da4150e04620a
  F src/prepare.c 82e5db1013846a819f198336fed72c44c974e7b1
  F src/printf.c 0c4bcdd1c2e2521024f0a69cb5eb334f86b3652a
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
- F src/resolve.c 3126f7694b8ce0f97282d7dd3a5198b8fa18dce9
+ F src/resolve.c 1954a0f01bf65d78d7d559aea3d5c67f33376d91
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
- F src/select.c c17613385bc6b095c421b1f30548814f5fd8a9b2
+ F src/select.c 36ee14d729e182cd8b6796f980b7ab3fc9bcee72
  F src/shell.c 6332ef06db1390ef812cfdff1fc97b4fd76cdd42
- F src/sqlite.h.in 50f83145c6543000b7d27525ecaec59a23d8280b
+ F src/sqlite.h.in 4e06cb5fed36736242c66237991db6f3e2395eb9
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
  F src/sqlite3ext.h 64350bf36833a56ad675e27392a913f417c5c308
 -F src/sqliteInt.h 5afc6e50402be1e0a870f28e1cd8b32eb9db590f
 +F src/sqliteInt.h c530296105917134620d3fd779d9f44add2c23d3
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c f266ad8a2892d659b74f0f50cb6a88b6e7c12179
  F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e
@@@ -402,24 -402,24 +402,24 @@@ F src/trigger.c 322f23aad694e8f31d384dc
  F src/update.c eb7ab3ff2928628692a4f14be397c95f4a681d97
  F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
  F src/util.c fc612367108b74573c5fd13a85d0a23027f438bd
 -F src/vacuum.c 2ddd5cad2a7b9cef7f9e431b8c7771634c6b1701
 -F src/vdbe.c 5048103aa6bc9c01bf1a4620729256d1e873bb6c
 +F src/vacuum.c 983cc3754718ef169a6ea9aef86798bd28106f21
 +F src/vdbe.c 34fb6d592a9f9591f365811441b5cd81424d7f6f
  F src/vdbe.h 4bc88bd0e06f8046ee6ab7487c0015e85ad949ad
  F src/vdbeInt.h 8b867eac234e28627ffcace3cd4b4b79bbec664b
- F src/vdbeapi.c 0d890f57caf143b114a95ce699e59af51359c508
+ F src/vdbeapi.c 020681b943e77766b32ae1cddf86d7831b7374ca
 -F src/vdbeaux.c fd00b489ab3f44f2dca1e4344faf289b7bfcf649
 +F src/vdbeaux.c 4988b83d1e1989ee554b2fa4ca18f3606a78437c
  F src/vdbeblob.c 1d7b97115e7bbac4c318db416d2ca83fc779544a
  F src/vdbemem.c 19b3036aa4d676e7103b0fb5efd6327da455f915
  F src/vdbesort.c f5009e7a35e3065635d8918b9a31f498a499976b
  F src/vdbetrace.c 8befe829faff6d9e6f6e4dee5a7d3f85cc85f1a0
  F src/vtab.c 2ecfe020c10e0a0c7b078203fdba2fae844744bc
  F src/vxworks.h c18586c8edc1bddbc15c004fa16aeb1e1342b4fb
 -F src/wal.c 18b0ed49830cf04fe2d68224b41838a73ac6cd24
 -F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
 +F src/wal.c fd2351d771df2e147b0d6a952314078fa20af171
 +F src/wal.h 361b16891d2772294b138054c84f5a3bad6e9d05
  F src/walker.c 2e14d17f592d176b6dc879c33fbdec4fbccaa2ba
- F src/where.c 882fb44b36201fafc32dd7d59366f852806b7e70
+ F src/where.c d5eed2584542e7f3bc78ddef7809a9d76d14d811
  F src/whereInt.h 7892bb54cf9ca0ae5c7e6094491b94c9286dc647
- F src/wherecode.c 186b493599000e640203be0a441223b395dabd24
+ F src/wherecode.c 7660e1ad16817a921b099af553f3e1349352d16f
  F src/whereexpr.c 2473e4350e30f9b55d1c6a8f66ca23c689f23f1d
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
  F test/affinity2.test a6d901b436328bd67a79b41bb0ac2663918fe3bd
@@@ -1270,8 -1268,8 +1271,8 @@@ F test/vtab_alter.test 9e374885248f69e2
  F test/vtab_err.test 0d4d8eb4def1d053ac7c5050df3024fd47a3fbd8
  F test/vtab_shared.test ea8778d5b0df200adef2ca7c00c3c37d4375f772
  F test/wal.test dbfc482e10c7263298833bb1fc60b3ac9d6340a1
 -F test/wal2.test 1f841d2048080d32f552942e333fd99ce541dada
 +F test/wal2.test dc801f6d3f8f39d1534ffbd15a715b0b287508db
- F test/wal3.test 2b5445e5da44780b9b44712f5a38523f7aeb0941
+ F test/wal3.test 2ab8e490afe0164bfc89b185c8b2572e0d821f23
  F test/wal4.test 4744e155cd6299c6bd99d3eab1c82f77db9cdb3c
  F test/wal5.test 88b5d9a6a3d1532497ee9f4296f010d66f07e33c
  F test/wal6.test 4421cd5a2fa99d29cc91ef12fb23bed171ed3a4c
@@@ -1390,7 -1388,7 +1391,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 9cf3e51bcce1268dbb22cc8fa77160db3cb72746 1d018c35b9e81982df036f5e62a4a42219b54e02
- R 1d14b270775e001f1b8ca861860001e8
 -P c2fcb03299f2872d7f97a540ea145519f8b2e5cc
 -R 48a05a5fcfc27e989d0482f8603455ad
++P fc4d1de8aeb39a4c0ea9275a0bd2447535f1a955 c6ab807b72ddfc1462f61aa91442b6fac04ace8a
++R e076748ccf585cd56005015a1eafaf6b
  U drh
- Z bf5d5ac6ba09452f8091128d189ef356
 -Z 5529d899992d962be9e3269522b69c12
++Z e239d96f0cdfa77c62294b132f37cf69

diff --cc manifest.uuid
index 71622bcab31f62f329845bfb70efb2d9f8c54eec,8b729d01057956f78a2459a7938f39d39643f4c2..deb3655cf2dfcc5dc0dffd1ca33f10bcc9f8d737
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- fc4d1de8aeb39a4c0ea9275a0bd2447535f1a955
 -c6ab807b72ddfc1462f61aa91442b6fac04ace8a
++c63c1e15f8cc8981aa4dbec82d510ed70cd09797

diff --cc src/btree.c
Simple merge

diff --cc src/pager.c
Simple merge

diff --cc src/pager.h
Simple merge