Merge latest trunk changes with uri branch.

FossilOrigin-Name: af279f367e01732560b8b2b6aeb5ede4f04415dd

diff --cc manifest
index 9799fa5daf572e45990658f93d2bc07b04457216,cac930fd6445fac495b90e6ab6ca1b8f1afe0618..0ff82c27c9e99185b9bd8a9b336c6719644852e9
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Remove\ssome\sunused\scode\srelated\sto\sURI\sparsing.
- D 2011-05-03T15:09:05.969
 -C Merge\svtab-conflict\sbranch\swith\strunk.
 -D 2011-05-04T17:23:19.296
++C Merge\slatest\strunk\schanges\swith\suri\sbranch.
++D 2011-05-04T17:35:12.663
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 7a4d9524721d40ef9ee26f93f9bd6a51dba106f2
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -178,16 -179,16 +179,16 @@@ 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 f8777aefc000c9e342cbc6676df168c196c2b624
 -F src/sqlite.h.in 5d25d06b8ae0d624179dba9bebb7cce48ce831f0
++F src/sqlite.h.in 90b126a4e8515126799e6e2b7f5ba962283e38bd
  F src/sqlite3ext.h c90bd5507099f62043832d73f6425d8d5c5da754
- F src/sqliteInt.h 810f45e3151bc4a5a273aff4b881bfc9148f92c6
 -F src/sqliteInt.h e70a03bb66d209e279b3edeb57d4fdc42a1d9fda
++F src/sqliteInt.h d1794da98180a15974a5539eec5410187371adda
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 7ac64842c86cec2fc1a1d0e5c16d3beb8ad332bf
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
  F src/tclsqlite.c 501c9a200fd998a268be475be5858febc90b725b
- F src/test1.c 9ca440e80e16e53920904a0a5ac7feffb9b2c9a1
+ F src/test1.c e0e4af306b678da05334c2ccaf0377ae8f06e911
  F src/test2.c 80d323d11e909cf0eb1b6fbb4ac22276483bcf31
 -F src/test3.c 056093cfef69ff4227a6bdb9108564dc7f45e4bc
 +F src/test3.c 124ff9735fb6bb7d41de180d6bac90e7b1509432
  F src/test4.c d1e5a5e904d4b444cf572391fdcb017638e36ff7
  F src/test5.c e1a19845625144caf038031234a12185e40d315c
  F src/test6.c c7256cc21d2409486d094277d5b017e8eced44ba
@@@ -231,11 -232,11 +232,11 @@@ F src/test_wholenumber.c 6129adfbe7c744
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
  F src/tokenize.c 604607d6813e9551cf5189d899e0a25c12681080
  F src/trigger.c 144cc18bb701f3286484aae4292a9531f09278c8
- F src/update.c 81911be16ece3c3e7716aa18565b4814ec41f8b9
+ F src/update.c 5bcb56e5c7380a2eecb0e71891dbd4ad7437748f
  F src/utf.c d83650c3ea08f7407bd9d0839d9885241c209c60
 -F src/util.c 465fe10aabf0ca7d7826a156dab919b0b65c525a
 +F src/util.c 914e860d21496b19a912cd14f6f7a889a22f44e1
  F src/vacuum.c 05513dca036a1e7848fe18d5ed1265ac0b32365e
- F src/vdbe.c a7f8f72ae817f7f81a25be6e18d9a37e09b0649f
 -F src/vdbe.c 672ec2f41b95a6f35b5bbfe555689457dea4789e
++F src/vdbe.c b2070c926a896e59234e27412a45e261fe752235
  F src/vdbe.h 8a675fefdf7119441fe817c800a9a52440c2e797
  F src/vdbeInt.h fe8f58d305e629fff02f61f655aca1d299f1f6ae
  F src/vdbeapi.c e0e2672e0a96ae3f8575c8ecd02912a3e8a554a1
@@@ -931,7 -933,7 +934,7 @@@ F tool/speedtest8.c 2902c46588c40b55661
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- P b8a0f1b523d1f31c8e7a102ba4bae5935b07104a
- R 2dc3488a634991eebc6008406cc86975
 -P f55156c5194e85c47728b8a97fde3e5f0a5c9b56 1a113359705d307efa1833b1dfa5542b045dae43
 -R ce8473bec0301287a61bbbfd48f07dff
++P 008cd0ef6b504cf4549468f795aa46f8472f0130 8f9666af5f9459cbd0305a86281d745ea6163acf
++R 07deaa464fe0e27da6566a9a8b8c931b
  U dan
- Z 271aa5bc20c9ebf896bbbb0905472291
 -Z 6d8393d5b7b8dbdcf9f90f047ce29665
++Z 357fb32ea4341029d4a78088d4acc043

diff --cc manifest.uuid
index 267cf9b4d4fa9663ce748eb6d3246c61909a0b05,fbb720f5eeb58b74a2899f4c17d8308408b7aa29..4ff58741bcc1505920b8d566bd4fc29612a5bb6f
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 008cd0ef6b504cf4549468f795aa46f8472f0130
 -8f9666af5f9459cbd0305a86281d745ea6163acf
++af279f367e01732560b8b2b6aeb5ede4f04415dd

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

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/vdbe.c
Simple merge