Merge latest trunk changes with this branch.

FossilOrigin-Name: 2a1af0f29e4c387721ec1fb3a2b55e8605b8401d

diff --cc manifest
index 841501ef8db59153309ab069fb64593b70060d28,4b5530ecfd3fbcc915332bc87ae7313488bfb663..3988d455928c5482bdaf46977d0d8983967194d4
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Fix\ssome\scases\sin\sthe\sfts5\scode\swhere\sa\scorrupt\sdatabase\scould\scause\sa\sbuffer\soverread.
- D 2015-06-26T18:50:29.818
 -C Further\soptimization\sof\sSQL\sfunction\sdispatch.\s\sImprovements\sto\sopcode\ndocumentation.
 -D 2015-06-26T18:47:53.814
++C Merge\slatest\strunk\schanges\swith\sthis\sbranch.
++D 2015-06-26T19:33:04.560
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in 1063c58075b7400d93326b0eb332b48a54f53025
 +F Makefile.in 285a0a234ed7610d431d91671c136098c2bd86a9
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 -F Makefile.msc b7db9ccbbad1c495b98e5326a06cac03aa206127
 +F Makefile.msc de7668a4f537f91bdb185e7194a798b1d59f101f
  F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION ce0ae95abd7121c534f6917c1c8f2b70d9acd4db
@@@ -248,9 -171,9 +248,9 @@@ F ext/userauth/userauth.c 5fa3bdb492f48
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
 -F main.mk 68f86c21505d6b66765a13c193f00a53dde6a212
 +F main.mk d585680c45db1f68ec5ef88199fb10694d117e17
  F mkopcodec.awk c2ff431854d702cdd2d779c9c0d1f58fa16fa4ea
- F mkopcodeh.awk d5e22023b5238985bb54a72d33e0ac71fe4f8a32
+ F mkopcodeh.awk 0e7f04a8eb90f92259e47d80110e4e98d7ce337a
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
  F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
  F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
@@@ -390,16 -313,16 +390,16 @@@ F src/update.c 487747b328b7216bb7f6af06
  F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
  F src/util.c a6431c92803b975b7322724a7b433e538d243539
  F src/vacuum.c 2ddd5cad2a7b9cef7f9e431b8c7771634c6b1701
- F src/vdbe.c 3af2d06e2b36012631dc3331957df52febdf8678
- F src/vdbe.h 90048aea1910f9df93e6044592bd4a466dc9c5e7
- F src/vdbeInt.h 20295e482121d13437f69985f77db211cdc8bac1
+ F src/vdbe.c b425feab69fb29b3cf4d40c5c8ea585bce883307
+ F src/vdbe.h 7a75045d879118b9d3af7e8b3c108f2f27c51473
+ F src/vdbeInt.h 8b54e01ad0463590e7cffabce0bc36da9ee4f816
  F src/vdbeapi.c 6a0d7757987018ff6b1b81bc5293219cd26bb299
- F src/vdbeaux.c 4c82d6f686f72ea7d266d26d528a171b728626f7
+ F src/vdbeaux.c 13261b7597c7f189232f84a1e175a3268ea2c32b
  F src/vdbeblob.c 4f2e8e075d238392df98c5e03a64342465b03f90
- F src/vdbemem.c 4e947cd322bb531e3f7f6f58f0f536d182b38ef8
+ F src/vdbemem.c ae38a0d35ae71cf604381a887c170466ba518090
  F src/vdbesort.c f5009e7a35e3065635d8918b9a31f498a499976b
  F src/vdbetrace.c 8befe829faff6d9e6f6e4dee5a7d3f85cc85f1a0
 -F src/vtab.c c535e80259ebe616467181a83a4263555b97c694
 +F src/vtab.c 082b35a25a26e3d36f365ca8cd73c1922532f05e
  F src/vxworks.h c18586c8edc1bddbc15c004fa16aeb1e1342b4fb
  F src/wal.c ce2cb2d06faab54d1bce3e739bec79e063dd9113
  F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
@@@ -1364,7 -1286,7 +1364,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 954231d29d60460d423ecb132bbfb725b0ea375a
- R f24cf4dc2b8231a9cc4f2e0f89642df3
 -P 2abc44eb3b9d489321baa50bc25e17dafbda3687
 -R a98b4348d07c70a554120b6bb6158a33
 -U drh
 -Z 2205c193de128862e6e7711ff0d4d13b
++P 360c57bbb8bad6cc84af140f61e0282fa06462b4 eaddbf296aee98ffca82adade1b0d2fbefd09d7b
++R 46e30302e9c721b7ade798b428e70680
 +U dan
- Z eeb5dd5cce2b08a289c0b394982d9461
++Z 99ffda12a690ac2d5944e0d64e334d3f

diff --cc manifest.uuid
index 9fa8bd840da0d936a7ef13d3f9f744e26c33136e,37b4dbdf5ae7c87b384f11fecbadcc707cde23d4..2ca71080326d1d778998ca7d41509a2882f46404
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 360c57bbb8bad6cc84af140f61e0282fa06462b4
 -eaddbf296aee98ffca82adade1b0d2fbefd09d7b
++2a1af0f29e4c387721ec1fb3a2b55e8605b8401d