From: dan <dan@noemail.net>
Date: Wed, 11 Aug 2010 06:04:19 +0000 (+0000)
Subject: Merge experimental changes into trunk.
X-Git-Tag: version-3.7.2~53
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=216eaab2822b1ac5a91bd6ebaf985e9d8455f35b;p=thirdparty%2Fsqlite.git

Merge experimental changes into trunk.

FossilOrigin-Name: aa092ac928dc19bd356d25a1dfd3f432dc145ce6
---

216eaab2822b1ac5a91bd6ebaf985e9d8455f35b
diff --cc manifest
index fc2177865e,96901ca253..6256dce184
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Changes\sto\sdebugging\scode\sin\smutex_unix.c\sand\smutex_w32.c\sto\smake\san\sassert()\sstatement\sthreadsafe.
- D 2010-08-10T07:12:27
 -C Fix\sa\sbug\sin\spager.c\scausing\sit\sto\somit\sthe\sxSync()\scall\srequired\sfollowing\sa\shot-journal\srollback.
 -D 2010-08-10T15:46:07
++C Merge\sexperimental\schanges\sinto\strunk.
++D 2010-08-11T06:04:19
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in ec08dc838fd8110fe24c92e5130bcd91cbb1ff2e
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -841,7 -843,7 +843,7 @@@ F tool/speedtest2.tcl ee2149167303ba8e9
  F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- P 9cebaf2dca6dc35e489537fe7c55474e1029a98e
- R da77b0ae4e15ab90a6a323c7de4ca438
 -P eb3ac895bd92c880ac6acca58de8cf9643c2b5e4
 -R e4d9a3fc6619bf1654c442eda9a22d0e
++P e82e32bd431ccacd276df8241592eb5519d87122 42ba43ac690dc800fb8b969ae257a79942918342
++R 905d488f0b9b28e6cb7ddb8f6f378b5f
  U dan
- Z ef5f61caa72edd66e82b2e19ff2bf16a
 -Z d2fd5616e29600e0ee8548b4ff5a7e14
++Z cd4d4135a3c0d3f56327a6ac460d7792
diff --cc manifest.uuid
index 97623ccde7,219b4e1fad..e4168da7fd
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- e82e32bd431ccacd276df8241592eb5519d87122
 -42ba43ac690dc800fb8b969ae257a79942918342
++aa092ac928dc19bd356d25a1dfd3f432dc145ce6