From: drh <drh@noemail.net>
Date: Wed, 3 Mar 2010 22:43:37 +0000 (+0000)
Subject: Pull the latest Lemon updates from the lemon-update-2010 branch into
X-Git-Tag: version-3.7.2~563
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ccd0489baada31392da6539855093b75540176bf;p=thirdparty%2Fsqlite.git

Pull the latest Lemon updates from the lemon-update-2010 branch into
the trunk.

FossilOrigin-Name: 84d760bfc1d219fda99901061bb5db2cafe9eb1d
---

ccd0489baada31392da6539855093b75540176bf
diff --cc manifest
index 1ad467a64c,7daace87a9..4ecfd30359
--- a/manifest
+++ b/manifest
@@@ -1,8 -1,8 +1,8 @@@
  -----BEGIN PGP SIGNED MESSAGE-----
  Hash: SHA1
  
- C Modify\sthe\ssqlite3_log()\sinterface\sand\simplementation\sso\sthat\sit\snever\nuses\sdynamic\smemory\sallocation\s-\sto\savoid\sdeadlocking\swhen\scalled\swhile\nholding\sthe\smemory\sallocator\smutex.
- D 2010-03-03T22:25:18
 -C Fixed\scompiler\swarning\son\sVisual\sStudio.
 -D 2010-03-03T17:09:01
++C Pull\sthe\slatest\sLemon\supdates\sfrom\sthe\slemon-update-2010\sbranch\sinto\nthe\strunk.
++D 2010-03-03T22:43:38
  F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
  F Makefile.in 4f2f967b7e58a35bb74fb7ec8ae90e0f4ca7868b
  F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@@ -795,14 -795,24 +795,14 @@@ F tool/speedtest2.tcl ee2149167303ba8e9
  F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- P 0354ab279f0ea9915a14d1ed972b4aa6b5a27fd1
- R 926156f9ae585a784895773b700799f0
 -P 643728003218c9841425dffb6fe506763859fd37
 -R 88162007d47a23ce8840be57770bbe94
 -U icculus
 -Z 5062e0d6c2809b73b8e0e67b25c9222f
++P 28d1bc98d60319b10af427072037a0121bc76259 83495128c820e963c70d11c3196f81d8cf01f867
++R 5bcf7657cf8259e9279d36af5e2c5c7b
 +U drh
- Z a5e3e8dcfa2c5ad6badf36c518ae99a7
++Z 0f9492b8396c3d749ab3aae315e18f6d
  -----BEGIN PGP SIGNATURE-----
 -Version: GnuPG/MacGPG2 v2.0.14 (Darwin)
 +Version: GnuPG v1.4.6 (GNU/Linux)
  
- iD8DBQFLjuHSoxKgR168RlERAu2uAJ9FMiE/PiQGTF1xE6N9Vhp5wtfQGgCgiZmk
- jbyYImM3VWOBm37tm51Ua0M=
- =bI8b
 -iQIcBAEBAgAGBQJLjpetAAoJEDDcKcGyC63VEzEQAKFGgN98bElxiUheG0Y+nIug
 -6LqhN/lZAznL1q4t1TgJdHBtsZnBEtEzz0qmjneq68i2WRqADJAaavoqpgwuaoo8
 -U6RhPJMxO/40OUNangbj9dPFZRpkPepGWr3akOGR+0EldIcdoD6j4qRpB33Sz8BK
 -lc27s2tXtv3MgOnpYaONkjiOLeGj9K6OQJ6jwQoWMSwLbF2M1iZz6q1PS6teS0qw
 -awfNOBpugn3PVES47ePR2+s7/4rzL/AiAlUBmcr9B7MdIO29p5hVktKizx53OYyd
 -bueKRyH1KxIOGQdo/VBKJejF1eVcz+XnICwT1rytx46EB0AI6Y/F94SYoJETdkP3
 -XXgC5zzVxKVdjlHdqWbdYCKLNIfLQvUH+DJkchOO817YjEKeb36zlyNQePup+qm8
 -17jxHYejWiHKvB3/tjHo2WgJasaDjyLhe4h7w2/UBx2rkKtR3W3eta/guljwnQ+C
 -GexcgCzxS1QzwNB1F6+Awpu2P2fkN1l4Vmxg5aNGU6br4zntNKgTedDD7tVfUHVW
 -L8uPJBH0NCMgWHRKMcWSZvLSEZTY5A5OKgpteoIKHq23bTYNEBnYIsd6Qy7sF4Ez
 -3eBwLKqOIzh687Nq2OJ5mzgeuGIlrfTaaek06d3gHCmeCKCUaIwElaz2r1pn+AgT
 -8Ht2heYwOrxkQbqQA0Iv
 -=gus5
++iD8DBQFLjuYeoxKgR168RlERAlrSAKCA0xyD30EEpNmtBDVfUAqmfk5EZACeO+r+
++rLgIbkZX3mD3k7SGIl1BSp4=
++=sB+r
  -----END PGP SIGNATURE-----
diff --cc manifest.uuid
index 2d97de2ba4,d550c112ea..7491c653dc
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 28d1bc98d60319b10af427072037a0121bc76259
 -83495128c820e963c70d11c3196f81d8cf01f867
++84d760bfc1d219fda99901061bb5db2cafe9eb1d