From: drh <drh@noemail.net>
Date: Thu, 13 May 2010 08:53:41 +0000 (+0000)
Subject: The refactored of VFS SHM primitives are now working so merge the
X-Git-Tag: version-3.7.2~383
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=043c20e63e7c075e85ef554fdf7bbba5cd9c0ea7;p=thirdparty%2Fsqlite.git

The refactored of VFS SHM primitives are now working so merge the
wal-refactor branch back into the trunk.

FossilOrigin-Name: bce21c18380715e894eac9c173c97315e0d69d93
---

043c20e63e7c075e85ef554fdf7bbba5cd9c0ea7
diff --cc manifest
index fae36ae92a,c850c8b0ce..3e20abc84a
--- a/manifest
+++ b/manifest
@@@ -1,8 -1,8 +1,8 @@@
  -----BEGIN PGP SIGNED MESSAGE-----
  Hash: SHA1
  
- C Remove\sthe\sOP_Variable\soptimization\sof\scheck-in\s[48b77b04935d894]\ssince\sit\ncan\slead\sto\smalfunctions\sas\sdescribed\sin\sticket\s[26ff0c82d1e90].
- D 2010-05-12T13:50:23
 -C Change\sthe\sxShmSize()\simplementation\sin\sos_unix.c\sso\sthat\sit\swill\sonly\nincrease\sand\snever\sdecrease\sthe\ssize\sof\sa\sshared-memory\ssegment.
 -D 2010-05-13T08:33:36
++C The\srefactored\sof\sVFS\sSHM\sprimitives\sare\snow\sworking\sso\smerge\sthe\s\nwal-refactor\sbranch\sback\sinto\sthe\strunk.
++D 2010-05-13T08:53:42
  F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
  F Makefile.in a5cad1f8f3e021356bfcc6c77dc16f6f1952bbc3
  F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@@ -817,14 -817,14 +817,14 @@@ F tool/speedtest2.tcl ee2149167303ba8e9
  F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- P c501b2ede6aad123bef0aa7ce8b356a134eb6d26
- R f34b360b99a8eca6d2a66ca5009c7cf8
 -P 3cab9022457ce50f82c5822d8ba6c04a3a85cb6a
++P 7838163d087780a6fb403a17641b96f71baec088 149d2ae4a6fe2f86822f286d2a7092c51bec7ebb
+ R 8a7d44076bf0e05c11800be3998eddd6
  U drh
- Z ec71604d99e1c3eded3bf24db26ac01b
 -Z 3a36caf9fe5b6632b303e603e184218b
++Z ffd3a6c6136965defa15e38ab4e7a314
  -----BEGIN PGP SIGNATURE-----
  Version: GnuPG v1.4.6 (GNU/Linux)
  
- iD8DBQFL6rIioxKgR168RlERArxoAJ96khmiBmpRdJSt374I6oMPRFYeDgCeJaEi
- RMst0QQ2MlMNKv1/iZMvQcE=
- =vEcN
 -iD8DBQFL67ljoxKgR168RlERAvKRAJ9jAZ2qvV6Q9GpsBE6wLhS3nq7pbACfcnYP
 -hXJABDPCTP9dztwWLTfVSAc=
 -=rTx0
++iD8DBQFL674ZoxKgR168RlERAsK5AJ4haW8eDmlcRUUp3Yf+C8gRnJAr1gCeNdrT
++0Fo99N7uchNWHAmE6yfdaFc=
++=KgrW
  -----END PGP SIGNATURE-----
diff --cc manifest.uuid
index fc05016e09,46bd746c8f..80b52dc314
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 7838163d087780a6fb403a17641b96f71baec088
 -149d2ae4a6fe2f86822f286d2a7092c51bec7ebb
++bce21c18380715e894eac9c173c97315e0d69d93