From: drh <drh@noemail.net>
Date: Wed, 7 Jul 2010 14:00:17 +0000 (+0000)
Subject: Merge together the accident fork.
X-Git-Tag: version-3.7.2~176
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=51538e9d907687561913c4d952cc64f198399e65;p=thirdparty%2Fsqlite.git

Merge together the accident fork.

FossilOrigin-Name: cdcf08cb18b1e290a4093454bebbd3e7094d6804
---

51538e9d907687561913c4d952cc64f198399e65
diff --cc manifest
index ae67851650,6f7e78ce09..1fb230a008
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,8 @@@
- C Make\ssure\sthe\sschema\sis\sloaded\sbefore\spreparing\sa\s"PRAGMA\sjournal_mode"\scommand.\sThis\shelps\sit\sreturn\smeaningful\sresults\swhen\sit\sis\sthe\sfirst\scommand\sexecuted\sby\sa\snew\sdatabase\sconnection.
- D 2010-07-07T13:54:29
 -C Fix\sminor\sissue\sin\sxAccess()\smethod\sfor\sWindows.
 -D 2010-07-07T13:58:11
++-----BEGIN PGP SIGNED MESSAGE-----
++Hash: SHA1
++
++C Merge\stogether\sthe\saccident\sfork.
++D 2010-07-07T14:00:17
  F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
  F Makefile.in c4270a1cd7cd70a263b7e96a258aa90e9c3618eb
  F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@@ -831,7 -831,7 +834,14 @@@ F tool/speedtest2.tcl ee2149167303ba8e9
  F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
--P 8156b57ac33161ae6dd8a9413127ecce3c9eae83
- R e41ff6377e33eb60459569336ce5c4d2
- U dan
- Z 29f850eebea1ce7652ffcd737a108779
 -R 0997b8c0aeeb70b49f1a9db77f666f95
 -U shaneh
 -Z 6fcb36d2434c0ecb594c639a41c5a5ab
++P ef126e775a02d69a9cab53028513e8799e1b6044 4bfd46f1db41009a1b925d61c6f074b933caa4ec
++R 0c8a529c4c9b7567d05e53b5d178ef4a
++U drh
++Z 02f7d9abcf94e9acc7e188aaa1f39a23
++-----BEGIN PGP SIGNATURE-----
++Version: GnuPG v1.4.6 (GNU/Linux)
++
++iD8DBQFMNIh1oxKgR168RlERAn8CAJ9lOhOruvcEEpoiChXfr4dyf3+7bQCfR3mM
++6rdx06TSs03YdLMZBvDwVrU=
++=y4S/
++-----END PGP SIGNATURE-----
diff --cc manifest.uuid
index 91c58d14b8,851503778f..ca43af9a54
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- ef126e775a02d69a9cab53028513e8799e1b6044
 -4bfd46f1db41009a1b925d61c6f074b933caa4ec
++cdcf08cb18b1e290a4093454bebbd3e7094d6804