Merge the uri branch with the trunk.

FossilOrigin-Name: 88df33c45fd5875ea82bc757b239fe3e61663c12

diff --cc manifest
index 07f26c7f2b1465cc13ef12fe1f62ebf7e9af7629,4b478aac3e7e76522a87f3d3349d22ea3691159c..5407a84c2fb2fc6eb9e55d0bc8b27e1ecc741634
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\swindows\stest\scase\sfixes.\sNo\schanges\sto\scode.
- D 2011-05-06T13:58:03.997
 -C Remove\ssome\sunnecessary\smodifications\sfrom\sthe\suri\sbranch.\sAdd\sa\stest\sto\sshow\sthat\sATTACH\sonly\sinterprets\sits\sargument\sas\sa\sURI\sif\sthe\sconnection\swas\sopened\swith\sSQLITE_OPEN_URI\s(or\sURI\sinterpretation\sis\sglobally\senabled).
 -D 2011-05-06T18:53:27.671
++C Merge\sthe\suri\sbranch\swith\sthe\strunk.
++D 2011-05-06T18:55:31.561
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 7a4d9524721d40ef9ee26f93f9bd6a51dba106f2
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -144,8 -144,8 +144,8 @@@ F src/journal.c 552839e54d1bf76fb8f7abe
  F src/legacy.c a199d7683d60cef73089e892409113e69c23a99f
  F src/lempar.c 7f026423f4d71d989e719a743f98a1cbd4e6d99e
  F src/loadext.c 3ae0d52da013a6326310655be6473fd472347b85
- F src/main.c a8571665d43ff18f89a49d47a281605ce5ea825e
+ F src/main.c 2f46bf58a6092d19c25109135a385aed65ce81e1
 -F src/malloc.c 74c740e8ba22b806cfb980c8c0ddea1cbd54a20e
 +F src/malloc.c 591aedb20ae40813f1045f2ef253438a334775d9
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c 00bd8265c81abb665c48fea1e0c234eb3b922206
  F src/mem2.c e307323e86b5da1853d7111b68fd6b84ad6f09cf
@@@ -179,9 -179,9 +179,9 @@@ F src/resolve.c 1c0f32b64f8e3f555fe1f73
  F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
  F src/select.c d9d440809025a58547e39f4f268c2a296bfb56ff
  F src/shell.c 72e7e176bf46d5c6518d15ac4ad6847c4bb5df79
- F src/sqlite.h.in 7c70c29eb59e008b6aa46cdc2caf5e057c987496
 -F src/sqlite.h.in 6acf3863a9ac8cd613029ff4d477519406632d78
++F src/sqlite.h.in 41a0e4bc842917226e170273f64b95717a63270a
  F src/sqlite3ext.h c90bd5507099f62043832d73f6425d8d5c5da754
- F src/sqliteInt.h e70a03bb66d209e279b3edeb57d4fdc42a1d9fda
+ F src/sqliteInt.h 88704cb43f5266981726c7aebe4fab15331fae9e
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 7ac64842c86cec2fc1a1d0e5c16d3beb8ad332bf
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -933,7 -935,7 +935,7 @@@ F tool/speedtest8.c 2902c46588c40b55661
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- P 0f4954e9793332573d4ffa0c1e199180f4cb990a 1586244b6d86d5a98af8c6f7a8324672e02df9c3
- R 591f03e045e4939df2af715bb8fd363a
 -P 92751788eae082e3104838cb6dd8b9793cb325d1
 -R 17771d4039dfb4d6c5c2179891343d50
++P 2e5c0ed724060388b97e0c0881bb1b68ec1a23b4 aa90b943254cf348aa2d23ac05e1895b188e2101
++R c22e979da3dd966376ac72fa0b40e97e
  U dan
- Z 39348870ee2abc5635df70a7deb111a7
 -Z 3db264a024c67033897f2ea9d71b0326
++Z b712e33d0a07bca3b809872e2e7a1ec4

diff --cc manifest.uuid
index 860c075a2241e629ce923ef6ccf24ee501681fdf,e0b4872a148076cc3c55d2e6b48651b8a40a6dc9..c42c56cef9652ec18dbca3b1903fabe9de022379
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 2e5c0ed724060388b97e0c0881bb1b68ec1a23b4
 -aa90b943254cf348aa2d23ac05e1895b188e2101
++88df33c45fd5875ea82bc757b239fe3e61663c12

diff --cc src/sqlite.h.in
Simple merge