Merge in the latest changes from trunk.

FossilOrigin-Name: c78b0d302c6908ad5bf75a4f6fb77d1a0b3e8a76

diff --cc manifest
index 03f3822c2b85a7fc1d192894bb8d24f5dc73ffb2,190659f0f2e81798394967826fbba6ae2764f617..08875a1c0f690234906f4a93d804023c6ee15912
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Another\sattempt\sat\sgeneralizing\sthe\sURI\sparsing\sso\sthat\sit\sworks\swith\sa\nwider\svariety\sof\sfile\sURIs\sand\syet\sremains\sbackwards\scompatible.
- D 2013-07-24T14:54:35.099
 -C Add\sa\sguard\s#ifndef\sto\stest_intarray.h\sto\sprevent\sharm\sif\sit\sis\s#included\nmore\sthan\sonce.\s\sAdd\sa\scomment\son\sthe\sclosing\s#endif\sof\sthe\sguards\son\nsqlite3.h\sand\stest_multiplex.h.
 -D 2013-08-07T14:18:45.279
++C Merge\sin\sthe\slatest\schanges\sfrom\strunk.
++D 2013-08-07T18:07:05.014
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -185,7 -185,7 +185,7 @@@ F src/journal.c b4124532212b6952f42eb2c
  F src/legacy.c 0df0b1550b9cc1f58229644735e317ac89131f12
  F src/lempar.c cdf0a000315332fc9b50b62f3b5e22e080a0952b
  F src/loadext.c 867c7b330b740c6c917af9956b13b81d0a048303
- F src/main.c a7efdff1516d77dcee9877dcf75fb5fa4ceaf3ea
 -F src/main.c b2592b4119f9b34d20861d1a73a44f07d061508c
++F src/main.c 0548b69c5a5f2a8e69788bda36d04e8e5f3e2760
  F src/malloc.c fe085aa851b666b7c375c1ff957643dc20a04bf6
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c 437c7c4af964895d4650f29881df63535caaa1fa
@@@ -422,21 -423,21 +423,21 @@@ F test/descidx3.test 09ddbe3f5295f482d2
  F test/diskfull.test 106391384780753ea6896b7b4f005d10e9866b6e
  F test/distinct.test 44028aaf161a5e80a2f229622b3a174d3b352810
  F test/distinctagg.test 1a6ef9c87a58669438fc771450d7a72577417376
- F test/e_createtable.test ddf3b2e4506e0813f46b69ccf55757c5570cc181
- F test/e_delete.test 89aa84d3d1bd284a0689ede04bce10226a5aeaa5
- F test/e_droptrigger.test afd5c4d27dec607f5997a66bf7e2498a082cb235
- F test/e_dropview.test 583411e470458c5d76148542cfb5a5fa84c8f93e
- F test/e_expr.test 2a599f40f37ee9e853c4396c28ff13c2c50f6628
+ F test/e_createtable.test ee9b70a38369ae44360febb411976aa3c8cf2689
+ F test/e_delete.test d5186e2f5478b659f16a2c8b66c09892823e542a
+ F test/e_droptrigger.test 3cd080807622c13e5bbb61fc9a57bd7754da2412
+ F test/e_dropview.test 0c9f7f60989164a70a67a9d9c26d1083bc808306
+ F test/e_expr.test d5cdda0e4ffb17760858ed4c7c4ece07efc40f71
  F test/e_fkey.test 17cfb40002d165299681f39aac0cb5890c359935
  F test/e_fts3.test 5c02288842e4f941896fd44afdef564dd5fc1459
- F test/e_insert.test d5331cc95e101af2508159fc98b6801631659ffe
- F test/e_reindex.test 5e6dff3a060b5234d496f6e84c3e59a94b4dce4d
+ F test/e_insert.test ea84688f3b27a6a3728e4ae7a7d9ad342579d7a4
+ F test/e_reindex.test e175794fc41f8e8aef34772e87a7d7b7a9251dd3
  F test/e_resolve.test dcce9308fb13b934ce29591105d031d3e14fbba6
- F test/e_select.test d5af998a402740d8f0488158d22075df2b6f88fa
- F test/e_select2.test 5c3d3da19c7b3e90ae444579db2b70098599ab92
- F test/e_update.test 161d5dc6a3ed9dd08f5264d13e20735d7a89f00c
- F test/e_uri.test cf5cf9a6f1e0f690ee6a2ee7a12d077ddccbeb0c
- F test/e_vacuum.test 331da289ae186656cf5f2eb27f577a89c0c221af
+ F test/e_select.test f2358d074bd82240bc79a8348f284a2a8909dc1f
+ F test/e_select2.test 22c660a7becf0712c95e1ca1b2d9e716a1261460
+ F test/e_update.test bea00499e43ee1da77b03cdb0b20c7c864c1ec5a
 -F test/e_uri.test a2c92d80093a7efdcfbb11093651cbea87097b6b
++F test/e_uri.test ab2d29fd1fcf1868d545b2d28668b26f7ea3f5d7
+ F test/e_vacuum.test 5bfbdc21b65c0abf24398d0ba31dc88d93ca77a9
  F test/enc.test e54531cd6bf941ee6760be041dff19a104c7acea
  F test/enc2.test 83437a79ba1545a55fb549309175c683fb334473
  F test/enc3.test 90683ad0e6ea587b9d5542ca93568af9a9858c40
@@@ -1103,10 -1105,7 +1105,7 @@@ F tool/warnings-clang.sh f6aa929dc20ef1
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
  F tool/wherecosttest.c f407dc4c79786982a475261866a161cd007947ae
  F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
- P ad0551e039ccaa9e7a28682b756b56ac2b8fef0d
- R a3b3b6e5ecdb948d76f9eeff9500d7ff
- T *branch * uri-enhancement
- T *sym-uri-enhancement *
- T -sym-trunk *
 -P f8d8790ede0fcaf6c5b60ac22919c1d97c74e838
 -R 2f7b5cf183df4b523d2c445c6f8fcaa5
++P de05eb75ecfd208846d583c82ec05c5c5ef7e8ce 0ad83ceb79767738bd06a28840cf84da0464ab4f
++R 0ce59fb6c3ea08987233d9c84c484884
  U drh
- Z a241308738f93f6f0a72323634a4306d
 -Z cdc793001b4bb9536e6929a443adf8d1
++Z 60b3b3406d5d4733696840d09390c33a

diff --cc manifest.uuid
index ed57efc076293e239edc2c83b760392bdf3e5d0d,bcffddd0ea3fdbf3bbb5bdc917f0d37bdaed8c91..bf620359ebb19ade60ac77e54002e3449fe298c1
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- de05eb75ecfd208846d583c82ec05c5c5ef7e8ce
 -0ad83ceb79767738bd06a28840cf84da0464ab4f
++c78b0d302c6908ad5bf75a4f6fb77d1a0b3e8a76

diff --cc src/main.c
Simple merge

diff --cc test/e_uri.test
Simple merge