From: drh <drh@noemail.net>
Date: Sat, 23 Jul 2011 13:54:34 +0000 (+0000)
Subject: Merge the winAccess retry logic from the anti-antivirus branch
X-Git-Tag: version-3.7.8~38^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5d22e41f2d0aaa5c824c62c4cfb498de6e2ac2f2;p=thirdparty%2Fsqlite.git

Merge the winAccess retry logic from the anti-antivirus branch
into the trunk.

FossilOrigin-Name: 08d0e8799e1441ef063b1cdf9e4107071a0f81ca
---

5d22e41f2d0aaa5c824c62c4cfb498de6e2ac2f2
diff --cc manifest
index c590aa5eff,b359bc1a22..758a9c3780
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C In\sthe\smultiplexor,\sclose\sauxiliary\sfiles\sbefore\sdeleting\sthem\swhen\sdoing\na\struncate.
- D 2011-07-23T13:11:02.100
 -C Add\sretry\slogic\sfor\sAV\sdefense\sto\swinAccess().\s\sAlso\sallow\sOS\stracing\sto\sbe\nenabled\sby\sa\scompile-time\soption.
 -D 2011-07-22T21:25:57.525
++C Merge\sthe\swinAccess\sretry\slogic\sfrom\sthe\santi-antivirus\sbranch\ninto\sthe\strunk.
++D 2011-07-23T13:54:34.013
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 1e6988b3c11dee9bd5edc0c804bd4468d74a9cdc
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -952,7 -952,11 +952,7 @@@ F tool/symbols.sh caaf6ccc7300fd4335331
  F tool/tostr.awk 11760e1b94a5d3dcd42378f3cc18544c06cfa576
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
  F tool/warnings.sh 2ebae31e1eb352696f3c2f7706a34c084b28c262
--P 8ce2b74a82264550b0e19da3e0e1a145db940a1c
- R 5ff3917e6e15573461029ec08177c1a8
 -R 0af84a25fe935b16dac1aa3e854e0baf
 -T *bgcolor * #d0c0ff
 -T *branch * av-defense
 -T *sym-av-defense *
 -T -sym-trunk *
++P 6fb7cfc2efb32dd5c8921a90b853390bc44d4794 a6b85c73406caa3bf0585341c8ebc9897a1884f4
++R 1255c11fb87a761a1f8eac495b8a38b4
  U drh
- Z 73fb0245292065880727bc255b6bd8fa
 -Z 9d105249d1658c472aed05118a4a48f3
++Z 2eecc3b1645ef2e7bef18a04829340dc
diff --cc manifest.uuid
index 06036314cf,2b894192c2..96e327d41a
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 6fb7cfc2efb32dd5c8921a90b853390bc44d4794
 -a6b85c73406caa3bf0585341c8ebc9897a1884f4
++08d0e8799e1441ef063b1cdf9e4107071a0f81ca