From: dan <dan@noemail.net>
Date: Tue, 27 Jul 2010 18:36:37 +0000 (+0000)
Subject: Merge trunk changes into experimental branch.
X-Git-Tag: version-3.7.2~53^2~36
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=eb8def8449b3a668900d017069c6b04b9f9e86c2;p=thirdparty%2Fsqlite.git

Merge trunk changes into experimental branch.

FossilOrigin-Name: 621824092d443425c420ba9010bbe1202fe99ea2
---

eb8def8449b3a668900d017069c6b04b9f9e86c2
diff --cc manifest
index 167b5239a5,3a65142d27..35fb977532
--- a/manifest
+++ b/manifest
@@@ -1,9 -1,12 +1,9 @@@
- C Add\sexperimental\sunix-only\sfile-control\sto\sgrow\sand\struncate\sthe\sdatabase\sfile\sby\sa\sconfigurable\schunk\ssize.
- D 2010-07-27T18:34:16
- F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 ------BEGIN PGP SIGNED MESSAGE-----
 -Hash: SHA1
 -
 -C Update\sthe\smakefiles\sto\sprefer\sTCL\sversion\s8.5\sinstead\sof\s8.4.
 -D 2010-07-27T16:42:23
++C Merge\strunk\schanges\sinto\sexperimental\sbranch.
++D 2010-07-27T18:36:38
+ F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in ec08dc838fd8110fe24c92e5130bcd91cbb1ff2e
- F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
- F Makefile.vxworks 4314cde20a1d9460ec5083526ea975442306ae7e
+ F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
+ F Makefile.vxworks c85ec1d8597fe2f7bc225af12ac1666e21379151
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
  F VERSION ddbfd1d7e557883fe2fd646cffe46c28cebcff48
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -170,14 -173,14 +170,14 @@@ F src/resolve.c 1c0f32b64f8e3f555fe1f73
  F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
  F src/select.c 74fef1334bec27e606ef0b19e5c41cd0a639e69c
  F src/shell.c fd4ccdb37c3b68de0623eb938a649e0990710714
- F src/sqlite.h.in 3b201a7aced2227339c2bba8dfbee47a823d43ad
 -F src/sqlite.h.in 5bc6d2d1bc5251b887123b12b67895785ff41a5f
++F src/sqlite.h.in 2dfa3db44fd123ea5f0e20e87fa3d9db189feb98
  F src/sqlite3ext.h 69dfb8116af51b84a029cddb3b35062354270c89
  F src/sqliteInt.h a9be6badc6cd6a3c1ae54475a98661cf351ecad5
  F src/sqliteLimit.h 196e2f83c3b444c4548fc1874f52f84fdbda40f3
- F src/status.c 51f65ba9768846c071fa621624d55d6866fce28b
+ F src/status.c 496913d4e8441195f6f2a75b1c95993a45b9b30b
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
  F src/tclsqlite.c ae1e4fb653c91ddad7e2534d209711a12604ccc4
 -F src/test1.c ff3b4533fc4d78d1bff2ef831a5791db55096ed3
 +F src/test1.c 0bfcda72f9f8ab5c0e90fac05cc22c1c21131ddf
  F src/test2.c e3f564ab1e9fd0b47b0c9e23e7054e38bf0836cf
  F src/test3.c 4c21700c73a890a47fc685c1097bfb661346ac94
  F src/test4.c 0528360b5025688002a5feb6be906ddce52eaaee
@@@ -839,10 -841,14 +839,7 @@@ F tool/speedtest2.tcl ee2149167303ba8e9
  F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- P 1d7571e4be6d96aec13cd8b3b7b10b8dc44d19a5
- R 06d24f984109c26ad9ccb04075848e30
- T *branch * experimental
- T *sym-experimental *
- T -sym-trunk *
 -P 6df081adbfa581c477bd2c96bb3f7f44be131a8f
 -R 2e30ee83ed26c6b6d858b65a1a40368a
 -U drh
 -Z 7c9b71a765785eb5366a775431acbda9
 ------BEGIN PGP SIGNATURE-----
 -Version: GnuPG v1.4.6 (GNU/Linux)
 -
 -iD8DBQFMTwxyoxKgR168RlERAoWhAKCIJmTkn9tifBBxLWcZZSTjSKv7hQCghz7k
 -L9/hegUPu/Ry2mCj4VCVOlE=
 -=kcSH
 ------END PGP SIGNATURE-----
++P 7cf0e851d4c5e826ea22ed08291b7c91d7b1abc7 8118de2af33557f75b4f2f1b1194a21d46ccf7fe
++R db6f0268ed3b851f8967be0e4ae70758
 +U dan
- Z 84d3b6ef35de3d3ded4f7f20ba0de5c7
++Z d9d588012d8704dd90455874cd937598
diff --cc manifest.uuid
index e26c476d95,c1bb427adf..9d45064bef
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 7cf0e851d4c5e826ea22ed08291b7c91d7b1abc7
 -8118de2af33557f75b4f2f1b1194a21d46ccf7fe
++621824092d443425c420ba9010bbe1202fe99ea2