From: mistachkin <mistachkin@noemail.net>
Date: Mon, 29 Apr 2013 09:20:06 +0000 (+0000)
Subject: Merge mmap test fix from trunk.
X-Git-Tag: version-3.7.17~24^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a3514f1027c56f7a28e304a0a1000fad441ef999;p=thirdparty%2Fsqlite.git

Merge mmap test fix from trunk.

FossilOrigin-Name: 95811877fdcbede4f61269ff1c7a6d9554f669cd
---

a3514f1027c56f7a28e304a0a1000fad441ef999
diff --cc manifest
index a1389464eb,2c3620bed6..28b0ee1d4d
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Adjust\sa\sWAL\stest\sresult\sdue\sto\schanges\sin\sthe\scorresponding\sreturn\scode\sname.
- D 2013-04-29T08:58:00.604
 -C Fix\smmap1.test\sso\sthat\sit\spasses\son\swindows\sas\swell\sas\sunix.
 -D 2013-04-29T09:17:42.276
++C Merge\smmap\stest\sfix\sfrom\strunk.
++D 2013-04-29T09:20:06.908
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in ce81671efd6223d19d4c8c6b88ac2c4134427111
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -1060,7 -1060,7 +1060,7 @@@ F tool/vdbe-compress.tcl f12c884766bd14
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
  F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
- P 3a245a832d4843802c3c57f8cda3e4e1d0d52622
- R 1a463c1687098b31a5ca5a9b6654d1e1
 -P e81e9ca11db09424dd310bbc91686a5daa618cb1
 -R 0b5ca68b3c8f8712e6440b0981a1650e
 -U dan
 -Z 3af177977b6ccb1ab6aa9597c01ddcc6
++P 9272009f7932b3f18006f73776e36b8ef8770d3e 52417eac3ecaec2dbbde170334358f5ddbd32501
++R cae271d9506bb2366270e651f8369050
 +U mistachkin
- Z 6828b536c59e8064e8c8cfbf273b3447
++Z f51e73792b7552ee4009f7c1e977bae2
diff --cc manifest.uuid
index b11e58d75d,b4bcb2b27e..0546659517
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 9272009f7932b3f18006f73776e36b8ef8770d3e
 -52417eac3ecaec2dbbde170334358f5ddbd32501
++95811877fdcbede4f61269ff1c7a6d9554f669cd