From: drh <drh@noemail.net>
Date: Wed, 3 Aug 2011 22:06:39 +0000 (+0000)
Subject: Merge the winopen-retry-logic branch into trunk.  The biggest change here
X-Git-Tag: version-3.7.8~82
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f9042e9682686c5bc77a539a493bccda9aff6002;p=thirdparty%2Fsqlite.git

Merge the winopen-retry-logic branch into trunk.  The biggest change here
is to test scripts, which should now use such as copy_file and
delete_file from tester.tcl rather than the raw file commands of TCL.

FossilOrigin-Name: b90c28be3840169651022ef36cd7cf416bc22305
---

f9042e9682686c5bc77a539a493bccda9aff6002
diff --cc manifest
index f8aebc816c,880ff3ba85..6ca37535c3
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Update\sthe\sOP_Move\sopcode\sto\sshift\sthe\spScopyFrom\spointer\sof\saliases\swhen\ncompiled\swith\sSQLITE_DEBUG.\s\sTicket\s[d63523637517386191].
- D 2011-08-03T16:40:15.202
 -C Add\sexplanatory\scomment\sto\sthe\swin32lock-2.2\stest\scase.
 -D 2011-08-02T23:45:53.187
++C Merge\sthe\swinopen-retry-logic\sbranch\sinto\strunk.\s\sThe\sbiggest\schange\shere\nis\sto\stest\sscripts,\swhich\sshould\snow\suse\ssuch\sas\scopy_file\sand\ndelete_file\sfrom\stester.tcl\srather\sthan\sthe\sraw\sfile\scommands\sof\sTCL.
++D 2011-08-03T22:06:39.312
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 1e6988b3c11dee9bd5edc0c804bd4468d74a9cdc
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -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 2caebe3ac9c227b076fd58a9fbd818715ec59379
 +F test/permutations.test 2c845b5c8cd2abb32f07076734d10e6a9fd19f26
- 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
@@@ -735,9 -735,8 +735,9 @@@ F test/tkt-b72787b1.test e6b62b2b2785c0
  F test/tkt-bd484a090c.test 60460bf946f79a79712b71f202eda501ca99b898
  F test/tkt-cbd054fa6b.test f14f97ea43662e6f70c9e63287081e8be5d9d589
  F test/tkt-d11f09d36e.test fb44f7961aa6d4b632fb7b9768239832210b5fc7
 +F test/tkt-d635236375.test 9d37e988b47d87505bc9445be0ca447002df5d09
  F test/tkt-d82e3f3721.test 731359dfdcdb36fea0559cd33fec39dd0ceae8e6
- F test/tkt-f3e5abed55.test 19fb59268da6f20a69a181b9c14154132d1c65e3
+ F test/tkt-f3e5abed55.test 669bb076f2ac573c7398ce00f40cd0ca502043a9
  F test/tkt-f777251dc7a.test 6f24c053bc5cdb7e1e19be9a72c8887cf41d5e87
  F test/tkt-f7b4edec.test d998a08ff2b18b7f62edce8e3044317c45efe6c7
  F test/tkt-f973c7ac31.test 1da0ed15ec2c7749fb5ce2828cd69d07153ad9f4
@@@ -955,7 -954,7 +955,7 @@@ F tool/symbols.sh caaf6ccc7300fd4335331
  F tool/tostr.awk 11760e1b94a5d3dcd42378f3cc18544c06cfa576
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
  F tool/warnings.sh 2ebae31e1eb352696f3c2f7706a34c084b28c262
- P 78fc94c8d1229a8bdc9390e98b53c57aeef7fc46
- R bf0be95f6edb13861054cdf974a28d09
 -P 7baf02946e14eb889d864984ff3b3822aad8a3c9
 -R 47b1cf7826a3e63c594957b3cfc97529
 -U mistachkin
 -Z 7b594a9d83a13099dd5de5b0bd599b2c
++P a2135ad13049c170b33315a949b1544e6a136183 4cb17881d9676fa3359394391b9ba53f08e5809a
++R 69e73a0d833d24111d142317de3be42c
 +U drh
- Z 63c3906617d97d8acb37208d4ff59628
++Z e1999267404d37fe86d90d3e80b00531
diff --cc manifest.uuid
index fe62bb02b3,7e6bee9e52..c95e730993
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- a2135ad13049c170b33315a949b1544e6a136183
 -4cb17881d9676fa3359394391b9ba53f08e5809a
++b90c28be3840169651022ef36cd7cf416bc22305