From: dan <dan@noemail.net>
Date: Mon, 9 Aug 2010 16:52:12 +0000 (+0000)
Subject: Merge latest trunk changes with experimental branch.
X-Git-Tag: version-3.7.2~53^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5a26383ab7fd07e87d0479079295623d0f0b4c45;p=thirdparty%2Fsqlite.git

Merge latest trunk changes with experimental branch.

FossilOrigin-Name: aecbd890327dc676d6c2366b07f3d2e636a4983e
---

5a26383ab7fd07e87d0479079295623d0f0b4c45
diff --cc manifest
index 8b71df0195,83511bb312..32b6a4f7db
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\sa\smemory\sleak\sin\stest_journal.c\scausing\stests\sto\sfail.
- D 2010-08-09T16:12:52
 -C Fix\stypos\sin\scomments.\s\sNo\sfunctional\schanges\sto\sthe\scode.
 -D 2010-08-09T15:44:21
++C Merge\slatest\strunk\schanges\swith\sexperimental\sbranch.
++D 2010-08-09T16:52:12
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in ec08dc838fd8110fe24c92e5130bcd91cbb1ff2e
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -168,11 -168,11 +168,11 @@@ F src/printf.c 8ae5082dd38a1b5456030c37
  F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
  F src/resolve.c 1c0f32b64f8e3f555fe1f732f9d6f501a7f05706
  F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
- F src/select.c 74fef1334bec27e606ef0b19e5c41cd0a639e69c
+ F src/select.c 4b8f481406c7fd2672abf715a2acaed8f9cde046
  F src/shell.c 8517fc1f9c59ae4007e6cc8b9af91ab231ea2056
- F src/sqlite.h.in 372baf01f7f58b18dfa85e13b55985f2edd6ebc8
 -F src/sqlite.h.in 1d29cd776795b0daa925fa5e8082ad79ba8e4ac4
++F src/sqlite.h.in 2d72a6242df41c517e38eec8791abcf5484a36f1
  F src/sqlite3ext.h 69dfb8116af51b84a029cddb3b35062354270c89
- F src/sqliteInt.h 1086f4a396d6a99c6a8d6654dfb5eb6adf3a476b
+ F src/sqliteInt.h e33b15e8176442bf7484f0e716edfd1ce03b2979
  F src/sqliteLimit.h 196e2f83c3b444c4548fc1874f52f84fdbda40f3
  F src/status.c 496913d4e8441195f6f2a75b1c95993a45b9b30b
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -843,7 -841,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 c3e771b3cf685f4237a2516ee7111849bf0ffb3f
- R fafdcc6c6bb38040ee797c40ede9da75
 -P 88bf9016277c133dfbf4f4b2be0c35c9fe9fabd6
 -R c5c5f9fc6458acbfcc375160225b3808
 -U drh
 -Z 2830757563a35deecc4832f7a9731398
++P f229487cccc7514b2663e8e6e04798702c9cfb10 9cebaf2dca6dc35e489537fe7c55474e1029a98e
++R a8ec38097bd382b8337fdc3c678431ed
 +U dan
- Z 19e4a407fe616523b7236ad07579dec7
++Z 5adcbb92ea687904b54262b46cb56097
diff --cc manifest.uuid
index 55a281afff,2efccd667c..f41751d6b9
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- f229487cccc7514b2663e8e6e04798702c9cfb10
 -9cebaf2dca6dc35e489537fe7c55474e1029a98e
++aecbd890327dc676d6c2366b07f3d2e636a4983e