Merge latest trunk changes, including the fixes for test file

walprotocol.test.

FossilOrigin-Name: b425b99811b331d3eb531251a1fb4c883648cb56d7e0fec8eb1870ab3b123d50

diff --cc manifest
index 6bade535bb11d5a7b0865bdd5f23f326ab131edd,6f7fbcd4c603805a7b98cf5406bccc83e366138e..7231fd4c0a228bb1a618e90c844b974696cb08d1
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,8 -1,8 +1,8 @@@
- C Merge\sthe\ssnapshots-always-lock-the-wal-file\schange\sinto\sthis\sbranch.
- D 2017-11-28T13:48:42.669
 -C Update\stest\sfile\swalprotocol.test\sto\saccount\sfor\sthe\schanges\sin\sthe\swal\nlocking\sprotocol.
 -D 2017-11-30T07:55:15.935
 -F Makefile.in 6a879cbf01e37f9eac131414955f71774b566502d9a57ded1b8585b507503cb8
++C Merge\slatest\strunk\schanges,\sincluding\sthe\sfixes\sfor\stest\sfile\nwalprotocol.test.
++D 2017-11-30T07:56:43.427
 +F Makefile.in c097996f4eea365f81c5e29a892cb198205c156a7cdfb2c3c1e10709cd419929
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 -F Makefile.msc e5d7606238f55816da99f719969598df5b091aa2e9a6935c9412fcae8f53fc44
 +F Makefile.msc 6b76a1b3e7aa7af73ce870120ed880a288e0c7f1ee047940f62b23b514286726
  F README.md f5c87359573c4d255425e588a56554b50fdcc2afba4e017a2e02a43701456afd
  F VERSION 0c10cdfed866fdd2d80434f64f042c3330f1daaed12e54287beb104f04b3faaf
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -1513,38 -1508,38 +1513,38 @@@ F test/vtabJ.test d7b73675708cf63cfcb9d
  F test/vtab_alter.test 736e66fb5ec7b4fee58229aa3ada2f27ec58bc58c00edae4836890c3784c6783
  F test/vtab_err.test 0d4d8eb4def1d053ac7c5050df3024fd47a3fbd8
  F test/vtab_shared.test 5253bff2355a9a3f014c15337da7e177ab0ef8ad
 -F test/wal.test 613efec03e517e1775d86b993a54877d2e29a477
 -F test/wal2.test 2d81ffe2a02d9e5c7447b266f7153716cfcba7aecda5ed832db4544617399e29
 -F test/wal3.test 2a93004bc0fb2b5c29888964024695bade278ab2
 -F test/wal4.test 4744e155cd6299c6bd99d3eab1c82f77db9cdb3c
 -F test/wal5.test 9c11da7aeccd83a46d79a556ad11a18d3cb15aa9
 -F test/wal6.test b602704e4b066199bc89d91ca9000f335dcf4572
 +F test/wal.test 83635d428b0a3fe883939cedbaedf29e13a5affd
 +F test/wal2.test de1182f52eda816f298b678f4721eb4fecba7ac99d2a72d60cd41b88b83746e4
 +F test/wal3.test 82f70ca79e5db6829f9246f4a30d4a4751921c3b
 +F test/wal4.test 5755887f321baa4c55de0b91066fa7d0cafcac9d
 +F test/wal5.test 9304fada875d7279deb2783385b0ae1c02d96b88
 +F test/wal6.test 3d9b79194d15f5b4f6e4169f89f815c049edb2df
  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/walcksum.test add42a54d7c7d9bc72a913792022a195293bef2b
 +F test/walcrash.test 065a041da88f980df3830f09b7fe308337bb594a
 +F test/walcrash2.test 6eb6842d34cc5955726264c80566963c32a9cbea
 +F test/walcrash3.test 279640ffafa23f7564529ccd69bfb97849ccae9d
  F test/walcrash4.test e7b6e7639a950a0cca8e210e248c8dad4d63bf20
 -F test/walfault.test 1f8389f7709877e9b4cc679033d71d6fe529056b
 -F test/walhook.test ed00a40ba7255da22d6b66433ab61fab16a63483
 -F test/walmode.test 4022fe03ae6e830583672caa101f046438a0473c
 -F test/walnoshm.test 84ca10c544632a756467336b7c3b864d493ee496
 +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 0b92feb132ccebd855494d917d3f6c2d717ace20
+ F test/walprotocol.test a112aba0b79e3adeaa485fed09484b32c654e97df58e454aa8489ac2cd57bf84
 -F test/walro.test cb438d05ba0d191f10b688e39c4f0cd5b71569a1d1f4440e5bdf3c6880e08c20
 +F test/walro.test cac7fa52dffec99f15c6e266769628d711935e4064dbcd7466ce3479b5011eb5
  F test/walro2.test 8812e514c968bf4ee317571fafedac43443360ae23edd7d0f4ef1eae0c13e8e8
  F test/walrofault.test c70cb6e308c443867701856cce92ad8288cd99488fa52afab77cca6cfd51af68
 -F test/walshared.test 0befc811dcf0b287efae21612304d15576e35417
 -F test/walslow.test c05c68d4dc2700a982f89133ce103a1a84cc285f
 -F test/walthread.test de8dbaf6d9e41481c460ba31ca61e163d7348f8e
 +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 54cdeb02157acc979de41530b804ae7b09552bf1
@@@ -1684,7 -1679,7 +1684,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 1fd1034935b932e9e0a29b26931f7ccf9fb0bda916c4fa8b741bf6f48f124dda b81a31495bd27c1d96f7df653da3502054240cb5acf66b860da7f0f9b422a524
- R ce1e563938f18a80da5f4163a06f5f4a
 -P 75d699877fa7d06d30285ecf008fbedfdf68cc7965bb328c96f5a931d1f13f04
 -R fc8bdb8d48da4660663e6bac79ba45ec
++P 3ec976e01550d7fb4fb76cc4896c13c86f66a141060f5fe59319434dc6119116 64e567009dd56ef595850fe460925bc15fa875163541527638b654aa2b2cf785
++R 238440233616b2ed5434360d0cd4f8b5
  U dan
- Z 83a12225ed775f5cde42826fd19f9630
 -Z d8a8a814dbff1ab540fb1916cfe46931
++Z 04e54b20dfad3e329858cfd672877a28

diff --cc manifest.uuid
index dc8d42c11f009e62225113511951f5be68cc11c1,86aba2434a27199ee8f2b390c979bd5b3f778ce0..c441918b0aebe0eba8421c0e165cab2538663cc7
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 3ec976e01550d7fb4fb76cc4896c13c86f66a141060f5fe59319434dc6119116
 -64e567009dd56ef595850fe460925bc15fa875163541527638b654aa2b2cf785
++b425b99811b331d3eb531251a1fb4c883648cb56d7e0fec8eb1870ab3b123d50