From: drh <drh@noemail.net>
Date: Tue, 28 Sep 2010 07:14:03 +0000 (+0000)
Subject: Merge fixes for ticket [b351d95f9cd5ef17e9d9dbae18f5ca8611190001] into
X-Git-Tag: version-3.7.4~137
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f78f18e4e520b4b6b753c63fef331b61190fbb1f;p=thirdparty%2Fsqlite.git

Merge fixes for ticket [b351d95f9cd5ef17e9d9dbae18f5ca8611190001] into
the trunk.

FossilOrigin-Name: 1f7ef0af8d9e41cd41f9046d198132eabd89ab18
---

f78f18e4e520b4b6b753c63fef331b61190fbb1f
diff --cc manifest
index d7aead42bc,8591dbed95..f526ac24ae
--- a/manifest
+++ b/manifest
@@@ -1,8 -1,8 +1,8 @@@
  -----BEGIN PGP SIGNED MESSAGE-----
  Hash: SHA1
  
- C Simplifications\sto\sthe\sexpression\scode\sgenerator.\s\sRemove\sabout\s80\slines\sof\nolder\sand\sobsolete\scode.
- D 2010-09-27T18:14:12
 -C Replace\ssome\sunreachable\sbranch\sinstructions\swith\sassert()\sstatements.
 -D 2010-09-28T07:11:24
++C Merge\sfixes\sfor\sticket\s[b351d95f9cd5ef17e9d9dbae18f5ca8611190001]\sinto\s\nthe\strunk.
++D 2010-09-28T07:14:03
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in c599a15d268b1db2aeadea19df2adc3bf2eb6bee
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -870,14 -871,14 +871,14 @@@ F tool/speedtest2.tcl ee2149167303ba8e9
  F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- P a7645d293801da64a7579737d0a8b48117af2e2c
- R 31b9d8f725b1355a3ecd589f9c768e32
 -P ff49a5f00b3aa83bdacc95a32d60527c740a6c09
++P 53f5cfe11516d0496c7760378b6305c3088d479f 88b84bf18a4b27626f8a0a2d313706ddd4f13749
+ R 37b3df62f8033aa4a27c3e8908502e88
  U drh
- Z da56ebaf0e041408b3401a85ccd2b2a6
 -Z 921970772630327bcfaa82d637a390d3
++Z 5aec910a47bbe2ec6ed86e77486c7a25
  -----BEGIN PGP SIGNATURE-----
  Version: GnuPG v1.4.6 (GNU/Linux)
  
- iD8DBQFMoN73oxKgR168RlERAqBjAJ4/xTLrVYlxWxhlWBOiHhf+ogrH4gCdGQFv
- 0abukVW0mExAm/y5XFe9a7M=
- =VfNl
 -iD8DBQFMoZUfoxKgR168RlERAhhvAJwKZWkCURf7vxb6OtGfwugHaP3LbwCfRURd
 -2iZ0/mjfijHnmTwmuK0oL78=
 -=l4DR
++iD8DBQFMoZXEoxKgR168RlERAhhPAJ4jyC+TGxv3hBPL9D1deKDUOxZxAwCeMIr1
++zHDW5Z+/417ZSlRcozRFPLA=
++=wL0e
  -----END PGP SIGNATURE-----
diff --cc manifest.uuid
index b42edba870,5f4f67ec1f..497e13b8ba
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 53f5cfe11516d0496c7760378b6305c3088d479f
 -88b84bf18a4b27626f8a0a2d313706ddd4f13749
++1f7ef0af8d9e41cd41f9046d198132eabd89ab18