From: dan <dan@noemail.net>
Date: Tue, 13 Apr 2010 06:20:45 +0000 (+0000)
Subject: Sync wal branch with [012cf101bf].
X-Git-Tag: version-3.7.2~455^2~91
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=835ae8bcddffb9de1451f1edd1736c639f0853e4;p=thirdparty%2Fsqlite.git

Sync wal branch with [012cf101bf].

FossilOrigin-Name: 9d690f24f634696f76fa38372461cfa69263e91e
---

835ae8bcddffb9de1451f1edd1736c639f0853e4
diff --cc manifest
index 2f9e709d53,0092203951..d477b9f2ae
--- a/manifest
+++ b/manifest
@@@ -1,8 -1,5 +1,5 @@@
- -----BEGIN PGP SIGNED MESSAGE-----
- Hash: SHA1
- 
- C Remove\sduplicate\ssecure_delete\spragma\simplemention.
- D 2010-04-12T19:32:00
 -C Test\sthat\sthe\srollback-hook\sis\sinvoked\sif\sa\scommit-hook\simplementation\sreturns\snon-zero\s(causing\sa\srollback).\sRemove\sdocumentation\scomment\sthat\ssays\sotherwise\sfrom\ssqlite.h.in.
 -D 2010-04-13T06:18:02
++C Sync\swal\sbranch\swith\s[012cf101bf].
++D 2010-04-13T06:20:45
  F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
  F Makefile.in 4f2f967b7e58a35bb74fb7ec8ae90e0f4ca7868b
  F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@@ -806,14 -797,7 +803,7 @@@ F tool/speedtest2.tcl ee2149167303ba8e9
  F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- P 8de9f010044fc992b5b45a7bb0da1284b404ecdb
- R 8d5d43ae19836a365923e6a5505ada34
- U drh
- Z ed2aa69bda36500ab38a65459c32fa94
- -----BEGIN PGP SIGNATURE-----
- Version: GnuPG v1.4.6 (GNU/Linux)
- 
- iD8DBQFLw3UzoxKgR168RlERAvKMAJ411flPN1Hpy71eZLlqKus1l1HRZwCdFOYO
- H++hcxwG2yJTYj8rinuj2EU=
- =pmZ3
- -----END PGP SIGNATURE-----
 -P e7e7127f0b0db582274338a9fefc30a0c0be07c3
 -R 169f65701c60c914b5babe14af8a5a2d
++P c15fda145b621fc86402914aa5b015e53590555a 012cf101bf8be9e39c138786ea5a5039b8131e55
++R a82603ab9844babf112f19212a1fe8c5
+ U dan
 -Z 59ba641787a7f590bcc552c76de3273b
++Z 1e9c7b3cdd0156e9796faa9c1b265349
diff --cc manifest.uuid
index b5ec0432b8,8176592c4b..1d692935b5
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- c15fda145b621fc86402914aa5b015e53590555a
 -012cf101bf8be9e39c138786ea5a5039b8131e55
++9d690f24f634696f76fa38372461cfa69263e91e