From: drh <drh@noemail.net>
Date: Mon, 14 Jun 2010 17:09:53 +0000 (+0000)
Subject: Merge the experimental shared-memory mmap-by-chunk changes into the trunk.
X-Git-Tag: version-3.7.2~275
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6f72beb20cd2b5a4d66391f046bb4adf4fb3c6b4;p=thirdparty%2Fsqlite.git

Merge the experimental shared-memory mmap-by-chunk changes into the trunk.

FossilOrigin-Name: f295e7ed5f04f6b8bffdaff8b565be3836ce4e80
---

6f72beb20cd2b5a4d66391f046bb4adf4fb3c6b4
diff --cc manifest
index c374482ea8,86656a4e33..95e8cf0a0c
--- a/manifest
+++ b/manifest
@@@ -1,8 -1,5 +1,8 @@@
 -C Add\sthe\snew\sxShmMap\s(formerly\sxShmPage)\sto\sos_win.c.
 -D 2010-06-14T16:16:34
 +-----BEGIN PGP SIGNED MESSAGE-----
 +Hash: SHA1
 +
- C Refactor\sand\ssimplify\sthe\slogic\sused\sto\schange\sjournalmode.
- D 2010-06-11T17:01:25
++C Merge\sthe\sexperimental\sshared-memory\smmap-by-chunk\schanges\sinto\sthe\strunk.
++D 2010-06-14T17:09:53
  F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
  F Makefile.in a5cad1f8f3e021356bfcc6c77dc16f6f1952bbc3
  F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@@ -823,14 -820,7 +823,14 @@@ F tool/speedtest2.tcl ee2149167303ba8e9
  F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- P af353bd89e5ec89f113d217225cc59cbc8373d64
- R 3e2d7a9cc84ff16ee3e947d8ce602cce
 -P fc0cabc15c97dde6a852b4f07df6d30f1d2c04bc
++P 95cc3f6fdec5494560c3cd4439d06870d1c62506 13e7a8242206bca4b5bf356ef074e66474d39609
+ R 25e35232d2e784a0633c25f463199a04
 -U dan
 -Z 06f3bcfd0aba7d97df7e9b4406c194ab
 +U drh
- Z e14f3acbecbf2df0abe6fde12480ec15
++Z 04fdb9faf7b89a9cf801831e630d8cdf
 +-----BEGIN PGP SIGNATURE-----
 +Version: GnuPG v1.4.6 (GNU/Linux)
 +
- iD8DBQFMEmvooxKgR168RlERAg5RAJ9VmP08NyW1of8QWkDMnAiHK8A/xgCeLBcs
- hbn4o1Zj2vKA/g5KFcfNycs=
- =Li8t
++iD8DBQFMFmJkoxKgR168RlERAk/eAJ9VllwzElSwe9gXOW0UoIt+bcEvsgCfSESl
++TnMmecbXjWkPCx7cvVOMr4o=
++=hImA
 +-----END PGP SIGNATURE-----
diff --cc manifest.uuid
index cc28afffbf,13f5f78d56..1711da0160
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 95cc3f6fdec5494560c3cd4439d06870d1c62506
 -13e7a8242206bca4b5bf356ef074e66474d39609
++f295e7ed5f04f6b8bffdaff8b565be3836ce4e80