Also merge the WAL blocking lock tests that were somehow missed on the

previous check-in.

FossilOrigin-Name: 7214dab7443d35c105904dd69635c1f8b45b2fc8

diff --cc manifest
index 01201de72831b9b4fdcd3ae1810a3dc19fa0aa14,d62ee302a3c9562498fe5ae66a1c05252409bb5c..47a6aa6b9918c073fe15369cd36c134ee3545229
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,7 -1,7 +1,7 @@@
- C Transient\slocks\sin\sWAL\smode\scan\snow\sblock\sin\sorder\sto\sresolve\spriority\ninversions.
- D 2015-03-17T16:59:57.519
 -C Add\sa\stest\sfor\sthe\schange\son\sthis\sbranch.
 -D 2015-03-17T16:01:29.508
++C Also\smerge\sthe\sWAL\sblocking\slock\stests\sthat\swere\ssomehow\smissed\son\sthe\nprevious\scheck-in.
++D 2015-03-17T17:08:35.872
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in 2f643d6968dfc0b82d2e546a0525a39079f9e928
 +F Makefile.in 88a3e6261286db378fdffa1124cad11b3c05f5bb
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
  F Makefile.msc 529e61cd9d29a3934758b4b3a0bb649b6c653481
  F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
@@@ -1245,7 -1242,7 +1246,8 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P ab832336f4a28193c4d2b61e833564822a7b86a8 c6e6d5f4e06c3ac0bfb620c0c728fbc7230c4a02
- R e9615c177cbff927553c4cf3589d469c
 -P c6e6d5f4e06c3ac0bfb620c0c728fbc7230c4a02
 -R 15a95b25b03827505e198326f8e27a62
 -U dan
 -Z 12b0ab91b3a13b6777d198c7ff155c7d
++P ec2f46de531ec8ef91981b19b48ab64db7727264 e22dde187eb0b389d6d93e2e39a26fd0f4e6196e
++R 35d1aacb5b2efba4948b8dccdeab808c
++T +closed e22dde187eb0b389d6d93e2e39a26fd0f4e6196e
 +U drh
- Z 0b12e1121ffbe338a20dac08008c6f99
++Z 7357efe8421db7654a103c304e504696

diff --cc manifest.uuid
index 804167befe18198be8bb2ee7514a2265623a010f,21c37ab89aeb5b91e3967c5a7473f5fb7141f5bc..f8ce2770f13fb815f98b88adda82f24ddd032bd6
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- ec2f46de531ec8ef91981b19b48ab64db7727264
 -e22dde187eb0b389d6d93e2e39a26fd0f4e6196e
++7214dab7443d35c105904dd69635c1f8b45b2fc8