Merge in all recent changes and enhancements from trunk.

FossilOrigin-Name: 84243f844417f888ab731841f7dbf95749f6e034

diff --cc manifest
index f71432393e29d9087ddf9b5104cbe66ba2a14070,88f6a39dac85c35370e68354dcd8f21cb40ddf4b..25f2d0b7358a041ca93742d7a3236fc75e9fb3ac
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Change\sfrom\susing\sthe\swin32-none\sVFS\sto\sjust\sa\squery\sparameter.
- D 2014-04-22T19:42:22.086
 -C Fix\sa\sproblem\sin\scalculating\sthe\scosts\sof\s"OR"\sscans.
 -D 2014-04-30T18:11:55.566
++C Merge\sin\sall\srecent\schanges\sand\senhancements\sfrom\strunk.
++D 2014-04-30T20:32:41.139
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -1161,7 -1166,7 +1166,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
  F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
- P be292d559748a24ff012266a1f58ce6c027e0411
- R f3c1c9d0a2061a78351193fe4c39a447
 -P 90e36676476e8db00658772e6c938242f766d306
 -R cf0f5a4a25fa17ee63b35d342904cb95
 -U dan
 -Z 15897e765882c5d27e5f655ffd8d3c94
++P ffceacf61905dc3553978ba5f68e133947eca2fa 9bbca48b42e4fe16f2188e18dc736da30a96435c
++R de599c68866896adcd34d6a6ff4634e0
 +U drh
- Z 55529acaca6c8896715e4d74b5257ddb
++Z adbf9541c1c60ea64244c304cb7bb6d4

diff --cc manifest.uuid
index fb9c97c16a44b81eb28957f72412135ba016451e,274547b53f0a41c20b54754b683d90402f5286ab..2b647b07266877bd54750c0bca4d53faf257e507
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- ffceacf61905dc3553978ba5f68e133947eca2fa
 -9bbca48b42e4fe16f2188e18dc736da30a96435c
++84243f844417f888ab731841f7dbf95749f6e034