Merge recent enhancements from trunk.

FossilOrigin-Name: ec052b4f14a8a7019bfc1bbe474020abafa557f3

diff --cc manifest
index 26f647c8e009aed0eb2d603018ed371684781839,729634b431e0fbe2b0c488b649cee947434dae09..7ef288e55f216e2cf5e748433211d337683722e2
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,6 -1,6 +1,6 @@@
- C Merge\sthe\sSQLITE_OMIT_CODEC_FROM_TCL\scompile-time\soption\sfrom\strunk.
- D 2016-03-16T01:09:07.904
 -C Fix\sFTS5\sso\sthat\sit\sworks\swith\sSQLITE_OMIT_AUTORESET.
 -D 2016-03-18T00:39:40.456
 -F Makefile.in f53429fb2f313c099283659d0df6f20f932c861f
++C Merge\srecent\senhancements\sfrom\strunk.
++D 2016-03-18T00:58:39.889
 +F Makefile.in 3aee0ba902634c52493914df76b40cedcd99b678
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc df0bf9ff7f8b3f4dd9fb4cc43f92fe58f6ec5c66
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
@@@ -337,18 -334,18 +337,18 @@@ 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 4547ba822e88bbbb4749730fb0825e8428485610
 -F src/os_unix.c 4bde11921a2bebcf2167efc8540ddabc814189dc
 -F src/os_win.c cbf8c442a0d818d05bcf40b093cb3ebad435b9be
++F src/os_unix.c 91e743e4fc65d95604e5d1fae4cb692754e99a65
 +F src/os_win.c 57a720ebb75dc55a1af042afd4f487e4db3e227b
  F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca
 -F src/pager.c 38718a019ca762ba4f6795425d5a54db70d1790d
 -F src/pager.h e1d38a2f14849e219df0f91f8323504d134c8a56
 +F src/pager.c 2c38bcb3117c4268a89a26a03a9abf2617002a2f
 +F src/pager.h ff4c0c4bdf5e0e1d6a6c004313e240822ceee4a1
  F src/parse.y 5ea8c81c5c41b27887f41b4a7e1c58470d7d3821
  F src/pcache.c 647bb53a86b7bbcf55ad88089b3ea5a9170b90df
  F src/pcache.h 4d0ccaad264d360981ec5e6a2b596d6e85242545
 -F src/pcache1.c c40cdb93586e21b5dd826b5e671240bd91c26b05
 -F src/pragma.c f0670909e915179fec47e17f72f14660995b8022
 +F src/pcache1.c dc4ad9b31cf603d14b3a90719f3aa874b4925137
- F src/pragma.c a1a9753ba148cd3b8b54554dad05c7b45456f7b5
++F src/pragma.c e1e161797d66c604633689f31035bf596b10f58f
  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
@@@ -364,7 -360,7 +364,7 @@@ F src/sqliteLimit.h 7b28cf72cbd52f178bf
  F src/status.c 70912d7be68e9e2dbc4010c93d344af61d4c59ba
  F src/table.c 5226df15ab9179b9ed558d89575ea0ce37b03fc9
  F src/tclsqlite.c 4bf3bea9b03aeac176ac114700f35f76a1de4c8a
- F src/test1.c 1dbe8af44c187414dfc1c91a3f06454b43fe5c60
 -F src/test1.c 941f1cb50a601c30fd426a381e783b863c9d7d13
++F src/test1.c e17bd82e5726545601b7841c863c445dcc5a31c1
  F src/test2.c 5586f43fcd9a1be0830793cf9d354082c261b25b
  F src/test3.c a8887dabbbee3059af338f20d290084a63ed1b0f
  F src/test4.c d168f83cc78d02e8d35567bb5630e40dcd85ac1e
@@@ -379,7 -375,7 +379,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 4126b74fe80e74313cccdad2ac72514614dfed13
 -F src/test_config.c 0fb2571777ef43a8442be4f9c62a25f530872328
++F src/test_config.c cb86019c5ce4943c3a7b6781ea4c9411355f90c3
  F src/test_demovfs.c 0de72c2c89551629f58486fde5734b7d90758852
  F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc
  F src/test_fs.c f10f840ca4f8c72e4837908bd8347ac4bcab074b
@@@ -420,21 -416,21 +420,21 @@@ F src/update.c 56b3db7edff0110360a12b76
  F src/utf.c 699001c79f28e48e9bcdf8a463da029ea660540c
  F src/util.c 34ef7be420f82415ec48131404995ddb6ee7502f
  F src/vacuum.c feb1eabb20987983d9350cad98299b21fa811f52
 -F src/vdbe.c 8cf45bb8da77d39f55d108e759d15a57acd0255c
 +F src/vdbe.c 3c7f4d447deaae0875879cb61460943011d94dfc
- F src/vdbe.h c743791f723049db94f009e3e30958952bc2d512
+ F src/vdbe.h 6f44193e7be52fd5f7c308175a936555b1e6b101
  F src/vdbeInt.h f88d3115e9bde33b01d81f0dd26d8dd51f995991
 -F src/vdbeapi.c 95b1f8e527240a18a9aea41a655b013bf07a7009
 +F src/vdbeapi.c 334db1c072f54fa5bb85bf552046d4397c5534f6
- F src/vdbeaux.c 2c15cf88de4df97428318c8cfac0dea873dae451
+ F src/vdbeaux.c a930f913d40e4ca6f6caaef6a7b5906a369fa2b1
  F src/vdbeblob.c 3b570b730109e8f653d9d2081649f6e7015113db
  F src/vdbemem.c 9b0cb32cc267ef026515f15a3594d5ff91fe4dfc
  F src/vdbesort.c 307460bfa4de4d1c3901fcd42089159131e34062
  F src/vdbetrace.c f75c5455d8cf389ef86a8bfdfd3177e0e3692484
  F src/vtab.c fd69fd398e23e57ea4ea377d8a44b6998fc569c7
  F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
 -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 5533002ddf4fbc256f450cb629668a200b06a3ce
+ F src/where.c fe7925faafbe9a458972035c0bb4753d672f04ed
  F src/whereInt.h 93297d56edd137b7ea004490690fb6e2ce028a34
  F src/wherecode.c 863aedf086131743763c1960637fde904eadc442
  F src/whereexpr.c fb87944b1254234e5bba671aaf6dee476241506a
@@@ -521,12 -517,12 +521,12 @@@ F test/btree01.test e08b3613540145b353f
  F test/btree02.test fe69453d474d8154d19b904157ff1db4812fed99
  F test/btreefault.test c2bcb542685eea44621275cfedbd8a13f65201e3
  F test/busy.test 76b4887f8b9160ba903c1ac22e8ff406ad6ae2f0
 -F test/cache.test 13bc046b26210471ca6f2889aceb1ea52dc717de
 +F test/cache.test 0bc2195f4a7207108af2617ed356e77daf4412f7
  F test/cacheflush.test af25bb1509df04c1da10e38d8f322d66eceedf61
  F test/capi2.test 011c16da245fdc0106a2785035de6b242c05e738
- F test/capi3.test bf6f0308bbbba1e770dac13aa08e5c2ac61c7324
+ F test/capi3.test db0731f6e2a94f96c6d4c478fedef4e0c077026c
  F test/capi3b.test efb2b9cfd127efa84433cd7a2d72ce0454ae0dc4
- F test/capi3c.test 06f6261f9e9b4ef6f76afcd9900f3665408af1c8
+ F test/capi3c.test b28ec47692f0fc50eb61b2d464d8d52e816b3732
  F test/capi3d.test 485048dc5cd07bc68011e4917ad035ad6047ab82
  F test/capi3e.test 3d49c01ef2a1a55f41d73cba2b23b5059ec460fe
  F test/cast.test 4c275cbdc8202d6f9c54a3596701719868ac7dc3
@@@ -889,12 -884,12 +889,12 @@@ F test/mallocI.test a88c2b9627c8506bf47
  F test/mallocJ.test b5d1839da331d96223e5f458856f8ffe1366f62e
  F test/mallocK.test 27cb5566a6e5f2d76f9d4aa2eca45524401fd61e
  F test/mallocL.test fb311ff80afddf3b1a75e52289081f4754d901dc
 -F test/malloc_common.tcl aac62499b76be719fac31e7a3e54a7fd53272e7f
 -F test/manydb.test 28385ae2087967aa05c38624cec7d96ec74feb3e
 +F test/malloc_common.tcl 8d368ee0b9d77c9643b174448f137c18b68e49f4
 +F test/manydb.test 3cd8e52ab3112cb8365afeedd6e8231977920577
  F test/mem5.test c6460fba403c5703141348cd90de1c294188c68f
 -F test/memdb.test c1f2a343ad14398d5d6debda6ea33e80d0dafcc7
 +F test/memdb.test c46019291625650d71416e770f6a54a281a1a98f
  F test/memleak.test 10b9c6c57e19fc68c32941495e9ba1c50123f6e2
- F test/memsubsys1.test 43f8c0e0e3be71d559d75f6ca6fbe22810cd9228
 -F test/memsubsys1.test 69924593856040e266fdd9aa1ecb4d5a0888eb12
++F test/memsubsys1.test 812cb1a29178d6819328ade63c23d6c31025da18
  F test/memsubsys2.test 3e4a8d0c05fd3e5fa92017c64666730a520c7e08
  F test/minmax.test 42fbad0e81afaa6e0de41c960329f2b2c3526efd
  F test/minmax2.test b44bae787fc7b227597b01b0ca5575c7cb54d3bc
@@@ -1308,35 -1303,35 +1308,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 613efec03e517e1775d86b993a54877d2e29a477
 -F test/wal2.test 56b0bc95b8693a0be294f8d210c49025dd094bd7
 -F test/wal3.test 2a93004bc0fb2b5c29888964024695bade278ab2
 -F test/wal4.test 4744e155cd6299c6bd99d3eab1c82f77db9cdb3c
 -F test/wal5.test 9c11da7aeccd83a46d79a556ad11a18d3cb15aa9
 -F test/wal6.test a9d6aa635b9d63607dabdc11406f5f96ca986635
 +F test/wal.test 83635d428b0a3fe883939cedbaedf29e13a5affd
- F test/wal2.test 7373f2079caaa3cd7648ad78b915d6253e87647a
- F test/wal3.test 3f0fd7eae5969f5ad65a16fe6b50be444f16a6e5
++F test/wal2.test 72286d113a40817702fa59285ee5b82effbfe754
++F test/wal3.test 82f70ca79e5db6829f9246f4a30d4a4751921c3b
 +F test/wal4.test 5755887f321baa4c55de0b91066fa7d0cafcac9d
 +F test/wal5.test 9304fada875d7279deb2783385b0ae1c02d96b88
 +F test/wal6.test 557fab4cc02b4ce2adf1d0f8821cb8acdaa1304f
  F test/wal64k.test 163655ecd2cb8afef4737cac2a40fdd2eeaf20b8
 -F test/wal7.test 2ae8f427d240099cc4b2dfef63cff44e2a68a1bd
 -F test/wal8.test d9df3fba4caad5854ed69ed673c68482514203c8
 +F test/wal7.test 18cf68ab8010ae0a2baaa48e5b59567a9503e63e
 +F test/wal8.test 82bf6e493002b2d1580823b40e47bce3e15f468a
  F test/wal9.test 378e76a9ad09cd9bee06c172ad3547b0129a6750
 -F test/wal_common.tcl a98f17fba96206122eff624db0ab13ec377be4fe
 -F test/walbak.test 018d4e5a3d45c6298d11b99f09a8ef6876527946
 -F test/walbig.test f437473a16cfb314867c6b5d1dbcd519e73e3434
 +F test/wal_common.tcl 15f152fd55703975878741beca6cfa4209d5b3b3
 +F test/walbak.test e322af729156c121183af4847c6e2b17bc629f47
 +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 4ab7ac01b77c2f894235c699d59e3e3c7f15a160
 -F test/walshared.test 0befc811dcf0b287efae21612304d15576e35417
 -F test/walslow.test c05c68d4dc2700a982f89133ce103a1a84cc285f
 -F test/walthread.test de8dbaf6d9e41481c460ba31ca61e163d7348f8e
 +F test/walro.test 310f5f364e64eaaa2f2233229a7b602ccb038bc9
 +F test/walshared.test 04590b10c677f75318701818c50bc0dda5da64ab
 +F test/walslow.test 07a51cbe9d4895d0a90c7af76d14a62d363ac162
 +F test/walthread.test c13f5a12fbd9d81e58f49875dc9dd8a52a84cf03
  F test/where.test f0c325563acde44f2c4ea6ba348e9e29f7121757
  F test/where2.test 478d2170637b9211f593120648858593bf2445a1
  F test/where3.test 1ad55ba900bd7747f98b6082e65bd3e442c5004e
@@@ -1461,7 -1456,7 +1461,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 f41a7361a1c59d0d681f2a81c2f70c1a9bbf7aee 45f7f0c80bd91a0c7ff859c27fd9e82e551bd83e
- R 718c79d891efadf5984a73c095dae2d0
 -P 6631e1e655604a7d1fb45b4d151938d4a13b47f3
 -R 472ca36ca6048890d22e3e80bb68c577
++P 161d91e485059efb36b7bc74d091f9721b76dcbf b199637d81d7e2a767131ac03c7679b101fd459c
++R d77de9b53d091e369f8d6b8489f35bed
  U drh
- Z e15c19088c79158f49cd3857a1983a50
 -Z 94c5a688910df424330581238168e35b
++Z 0387ad32ececb70effa1db288aa7e20b

diff --cc manifest.uuid
index edf77015532f3fe17b0b91bfc367b0ce17ca853d,d2044dd6ea6dcea615b0c82a8dda3c41f8deaa71..563a82095d03cb8de253baae2b7ec28d99dfdddc
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 161d91e485059efb36b7bc74d091f9721b76dcbf
 -b199637d81d7e2a767131ac03c7679b101fd459c
++ec052b4f14a8a7019bfc1bbe474020abafa557f3

diff --cc src/os_unix.c
Simple merge

diff --cc src/pragma.c
Simple merge

diff --cc src/test1.c
Simple merge

diff --cc src/test_config.c
Simple merge

diff --cc test/memsubsys1.test
Simple merge

diff --cc test/wal2.test
Simple merge

diff --cc test/wal3.test
Simple merge