From: dan <dan@noemail.net>
Date: Thu, 17 Jun 2010 16:44:52 +0000 (+0000)
Subject: Merge trunk change [7c3a86b9c7].
X-Git-Tag: version-3.7.2~256^2~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cd27cffa97a084fb4911ea5d669e11b8aabd0c1f;p=thirdparty%2Fsqlite.git

Merge trunk change [7c3a86b9c7].

FossilOrigin-Name: bd7bc4e0e28bc749034ff1a9290a69330c5d8ca4
---

cd27cffa97a084fb4911ea5d669e11b8aabd0c1f
diff --cc manifest
index d5453b91cc,1ed3a6b60a..f37774487e
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,8 +1,5 @@@
- C A\sdifferent\sfix\sto\s[fc62af4523].\sWhen\schanging\sfrom\sjournal_mode=PERSIST\sor\sTRINCATE\sto\ssome\sother\srollback\smode,\sdelete\sthe\sjournal\sfile\sonly\sif\sa\sRESERVED\slock\scan\sbe\sobtained\son\sthe\sdatabase\sfile\sfirst.
- D 2010-06-17T16:44:22
 ------BEGIN PGP SIGNED MESSAGE-----
 -Hash: SHA1
 -
 -C Fix\sthe\stkt-fc62af4523.test\sto\swork\saround\snon-randomness\sof\sthe\nrandomblob()\sfunction\swhen\sin\stesting\smode.
 -D 2010-06-17T16:08:54
++C Merge\strunk\schange\s[7c3a86b9c7].
++D 2010-06-17T16:44:53
  F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
  F Makefile.in a5cad1f8f3e021356bfcc6c77dc16f6f1952bbc3
  F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@@ -824,7 -826,14 +824,7 @@@ F tool/speedtest2.tcl ee2149167303ba8e9
  F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- P c1e04f1d4e8575ebc41b5b4403dbfe3f60d578dc
- R c1f8308c51de4402b52d191c23c2aef4
 -P 1ec74591a93e8b27ad3ac739914a48a91972e82c
 -R f22efcb25274595c63db494b4fd0d5e3
 -U drh
 -Z 5de72be9b8f0adddcd3189b98a437ea2
 ------BEGIN PGP SIGNATURE-----
 -Version: GnuPG v1.4.6 (GNU/Linux)
 -
 -iD8DBQFMGkiZoxKgR168RlERAqWGAJwJQXBZXrZmTaB1vIkV/5uryay3cACbBcij
 -ZJYGkT2oDVKZ+q0ThWu3qBk=
 -=rpt5
 ------END PGP SIGNATURE-----
++P b9b11855e8a9522309dd30e5256bb67d67e1353a 7c3a86b9c7e2a35ce755c32b38e911e79d843fad
++R 9b3c0e89ee34bf70754dc9094b410e06
 +U dan
- Z 10be27f6ff328697757cba4d76703f36
++Z cddd2246fd2d00b78e84c3f7e0542efe
diff --cc manifest.uuid
index aab680823a,ac9c423d57..2060936fd0
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- b9b11855e8a9522309dd30e5256bb67d67e1353a
 -7c3a86b9c7e2a35ce755c32b38e911e79d843fad
++bd7bc4e0e28bc749034ff1a9290a69330c5d8ca4