From: drh <drh@noemail.net>
Date: Mon, 3 May 2010 14:08:27 +0000 (+0000)
Subject: Merge the write-ahead-logging changes into the trunk.
X-Git-Tag: version-3.7.2~455
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e8e1c9d50e2c33685d8377954f80ce871ebbb458;p=thirdparty%2Fsqlite.git

Merge the write-ahead-logging changes into the trunk.

FossilOrigin-Name: de9ae443cc8eebfb0692dcdac93bde9e4c54199a
---

e8e1c9d50e2c33685d8377954f80ce871ebbb458
diff --cc manifest
index 54756b342f,cbf0c5ef1a..bfddf21179
--- a/manifest
+++ b/manifest
@@@ -1,10 -1,7 +1,10 @@@
 -C If\sthe\ssqlite3_wal_checkpoint()\sAPI\sis\spassed\sa\sNULL\spointer\sin\splace\sof\sa\sdatabase\sname,\sattempt\sto\scheckpoint\sall\sattached\sdatabases.
 -D 2010-05-03T14:05:43
 +-----BEGIN PGP SIGNED MESSAGE-----
 +Hash: SHA1
 +
- C Avoid\sassertion\sfaults\sin\squeries\susing\sindices\swith\sredundant\scolumns.\nTicket\s[3dbdcdb14e7f41].
- D 2010-04-30T21:03:24
++C Merge\sthe\swrite-ahead-logging\schanges\sinto\sthe\strunk.
++D 2010-05-03T14:08:28
  F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
- F Makefile.in 4f2f967b7e58a35bb74fb7ec8ae90e0f4ca7868b
+ F Makefile.in d83a0ffef3dcbfb08b410a6c6dd6c009ec9167fb
  F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
  F Makefile.vxworks ab005d301296c40e021ccd0133ce49ca811e319f
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
@@@ -801,14 -808,7 +811,14 @@@ F tool/speedtest2.tcl ee2149167303ba8e9
  F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- P f660be615a0c1f4641782a83744533f5d3119218
- R 037eba7c61c44ed46ed186528ab88ba6
 -P 11a85b821abff1ecb7ec8c37bc7783be9fc4ea6d
++P 946e06cd2a2cc209b0786b7e9d28c0746320d646 27a5c09ce8a35039d844d08cfe5698e8b438abfe
+ R 496e930fc5a775a552ace6c40959352e
 -U dan
 -Z 225bbd40c88bfb84bfc467a361edc728
 +U drh
- Z f87382a5b2e28a51f3f0db30682d2137
++Z 6de75408ba1e125bd7e7fd0306efd7dd
 +-----BEGIN PGP SIGNATURE-----
 +Version: GnuPG v1.4.6 (GNU/Linux)
 +
- iD8DBQFL20WioxKgR168RlERAlxiAJ4w8aexa2GTqhDb3cG3AfHpTGYYtACeMOWV
- +0spJvIkBg57uJ7hlauNec4=
- =n48A
++iD8DBQFL3tjgoxKgR168RlERAn8zAJ4myOF3FCYW6KNideNeI9JIkyQm6ACfbPiT
++qZo9Et3fACK9ap0KUhaVVwE=
++=UJ+t
 +-----END PGP SIGNATURE-----
diff --cc manifest.uuid
index d3d05c9085,c42491a7d5..c412be269d
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 946e06cd2a2cc209b0786b7e9d28c0746320d646
 -27a5c09ce8a35039d844d08cfe5698e8b438abfe
++de9ae443cc8eebfb0692dcdac93bde9e4c54199a