Merge the latest trunk changes into the winopen-retry-logic branch.

FossilOrigin-Name: 8bef97a0eb2f56d0ac374d97e97e0a44c7f99aee

diff --cc manifest
index 0905616d4ad3a4b4c198ca3e186c5105dc9b9508,b2ac7449256289262a272f8efe383bebd872a63f..e298f1e67f046907d109fab761cf71a0379e4de3
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Add\sretry\slogic\sfor\sAV\sdefense\sto\swinOpen.\s\sAlso,\srefactor\stest\ssuite\sto\sallow\sthe\skey\sTcl\sfile\soperations\s(e.g.\scopy\sand\sdelete)\sto\sbe\sretried.
- D 2011-08-02T00:57:34.578
 -C Omit\sbackcompat.test\sfrom\sthe\sjournaltest\spermutation\sbecause\sit\suses\sWAL\nmode\swhich\sis\sincompatible\swith\sjournaltest.
 -D 2011-08-02T19:30:20.260
++C Merge\sthe\slatest\strunk\schanges\sinto\sthe\swinopen-retry-logic\sbranch.
++D 2011-08-02T19:42:38.461
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 1e6988b3c11dee9bd5edc0c804bd4468d74a9cdc
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -250,8 -250,8 +250,8 @@@ F src/vtab.c 901791a47318c0562cd0c676a2
  F src/wal.c 3154756177d6219e233d84291d5b05f4e06ff5e9
  F src/wal.h 66b40bd91bc29a5be1c88ddd1f5ade8f3f48728a
  F src/walker.c 3112bb3afe1d85dc52317cb1d752055e9a781f8f
- F src/where.c 106cd9ab3eb410dfa7d0598194c277664bb2e9a3
+ F src/where.c 7d09f4c1512affb60cc1190a4b33d121d4ce039a
 -F test/8_3_names.test b93687beebd17f6ebf812405a6833bae5d1f4199
 +F test/8_3_names.test 631ea964a3edb091cf73c3b540f6bcfdb36ce823
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
  F test/alias.test 4529fbc152f190268a15f9384a5651bbbabc9d87
  F test/all.test 52fc8dee494092031a556911d404ca30a749a30b
@@@ -613,12 -613,12 +613,12 @@@ F test/pagerfault.test 452f2cc23e3bfcfa
  F test/pagerfault2.test 1f79ea40d1133b2683a2f811b00f2399f7ec2401
  F test/pagerfault3.test f16e2efcb5fc9996d1356f7cbc44c998318ae1d7
  F test/pageropt.test 8146bf448cf09e87bb1867c2217b921fb5857806
 -F test/pagesize.test 76aa9f23ecb0741a4ed9d2e16c5fa82671f28efb
 +F test/pagesize.test 1dd51367e752e742f58e861e65ed7390603827a0
  F test/pcache.test 065aa286e722ab24f2e51792c1f093bf60656b16
 -F test/pcache2.test 0d85f2ab6963aee28c671d4c71bec038c00a1d16
 +F test/pcache2.test 9f9357bb0f463b87bdf695646024ed2031a0c85a
- F test/permutations.test aae89941ca0968b53633c97b5dd0d6f9f9899d27
+ F test/permutations.test 434b3c91168969cee1385663748106f5f13b2f9c
 -F test/pragma.test fdfc09067ea104a0c247a1a79d8093b56656f850
 -F test/pragma2.test 5364893491b9231dd170e3459bfc2e2342658b47
 +F test/pragma.test c8108e01da04f16e67e5754e610bc62c1b993f6c
 +F test/pragma2.test 3a55f82b954242c642f8342b17dffc8b47472947
  F test/printf.test 05970cde31b1a9f54bd75af60597be75a5c54fea
  F test/progress.test 5b075c3c790c7b2a61419bc199db87aaf48b8301
  F test/ptrchng.test ef1aa72d6cf35a2bbd0869a649b744e9d84977fc
@@@ -871,9 -871,10 +871,10 @@@ F test/vtab8.test e19fa4a538fcd1bb66c22
  F test/vtab9.test ea58d2b95d61955f87226381716b2d0b1d4e4f9b
  F test/vtabA.test c86e1990b7e1e2bb34602a06fffa4c69f2b516dc
  F test/vtabB.test 04df5dc531b9f44d9ca65b9c1b79f12b5922a796
 -F test/vtabC.test 1cf7896ab6859bfe3074244b2b0e12de5cbdd766
 +F test/vtabC.test 4528f459a13136f982e75614d120aef165f17292
  F test/vtabD.test 74167b1578e5886fe4c886d6bef2fd1406444c42
  F test/vtabE.test 7c4693638d7797ce2eda17af74292b97e705cc61
+ F test/vtabF.test fd5ad376f5a34fe0891df1f3cddb4fe7c3eb077e
  F test/vtab_alter.test 9e374885248f69e251bdaacf480b04a197f125e5
  F test/vtab_err.test 0d4d8eb4def1d053ac7c5050df3024fd47a3fbd8
  F test/vtab_shared.test 0eff9ce4f19facbe0a3e693f6c14b80711a4222d
@@@ -953,10 -954,7 +954,7 @@@ F tool/symbols.sh caaf6ccc7300fd4335331
  F tool/tostr.awk 11760e1b94a5d3dcd42378f3cc18544c06cfa576
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
  F tool/warnings.sh 2ebae31e1eb352696f3c2f7706a34c084b28c262
- P ed630b012f468d6779b83dd8c4dbf3a8dafee573
- R 735027666e11a1bb5deb1c9d66f6a810
- T *branch * winopen-retry-logic
- T *sym-winopen-retry-logic *
- T -sym-trunk *
- U mistachkin
- Z 48ff1b46b7d2b6052641cde313ef9900
 -P a55f4ab99952a731e4cd8f6ef17389062e5ed4c5
 -R 2ce41a9c949729a862f5ca8012f8f07d
++P 9007586fdabed8dbcc78581ea9821cfd1f9a4c8c 2bbf3150a4b7108e88ed81c1d40af6f06089e148
++R ed676f9c5b5c5c1cb85f45ddea5340b8
+ U drh
 -Z 9aaddca534c660973358cb12c28015e6
++Z a5575159f660bba167a59a6dccad64eb

diff --cc manifest.uuid
index 04c96eaa227baca035d0563a583f911ebca1105b,92e2001b23b2d8045bb797954f0762a78811b368..04d765101d138da4aecc73688db90f7bf60a05c5
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 9007586fdabed8dbcc78581ea9821cfd1f9a4c8c
 -2bbf3150a4b7108e88ed81c1d40af6f06089e148
++8bef97a0eb2f56d0ac374d97e97e0a44c7f99aee