Merge latest trunk changes with this branch.

FossilOrigin-Name: cf7590f607d94a120385576b538484ca738349e2

diff --cc manifest
index bd566ce541a5052b897f8c37275ac6bb6f69bee6,871fd87da447dfdc33b4f984d75d9c562ff27cff..8bf0dc4b3ccd50cce52c5f4eddf2540e7f814e34
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Update\sthis\sbranch\swith\slatest\strunk\schanges.
- D 2015-04-10T08:20:42.809
 -C Add\sthe\s--changeset\soption\sto\sthe\ssqldiff\sutility\sprogram,\sfor\sgenerating\na\ssessions\schangeset\sfile\sinstead\sof\san\sSQL\sdiff.
 -D 2015-04-11T13:49:16.216
++C Merge\slatest\strunk\schanges\swith\sthis\sbranch.
++D 2015-04-11T18:45:55.781
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 5f78b1ab81b64e7c57a75d170832443e66c0880a
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -292,17 -292,17 +292,17 @@@ F src/trigger.c 69a91bed7c94e46223e37ff
  F src/update.c 3c4ecc282accf12d39edb8d524cf089645e55a13
  F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
  F src/util.c 98a7627ca48ad3265b6940915a1d08355eb3fc7e
 -F src/vacuum.c 9460b9de7b2d4e34b0d374894aa6c8a0632be8ec
 -F src/vdbe.c 06cc2cf42daf8b0c397f69a6fb1818124f3cd93a
 -F src/vdbe.h 6fc69d9c5e146302c56e163cb4b31d1ee64a18c3
 +F src/vacuum.c 2ddd5cad2a7b9cef7f9e431b8c7771634c6b1701
- F src/vdbe.c f6647e7426b70826a03e69bd295d18c93ff5ae07
++F src/vdbe.c c4bd96912f8837777bfe5762d310767ed628b442
 +F src/vdbe.h 7e538ecf47dccb307ea2d087c3ddc2dd8d70e79d
  F src/vdbeInt.h 9cbaa84f53ddd2d09a0cf61a94337a3a035d08a0
  F src/vdbeapi.c 583d56b129dd27f12bed518270de9ebe521e6a75
 -F src/vdbeaux.c 413dc496248ac18eb0c19e35e86bb1ffd47b8907
 +F src/vdbeaux.c a20504ae52392459fa08402fda3f195f19d7c79d
  F src/vdbeblob.c 4f2e8e075d238392df98c5e03a64342465b03f90
  F src/vdbemem.c c0dc81285b7571b0a31c40f17846fe2397ec1cd9
 -F src/vdbesort.c 919717d7599fa31d343ec28bffd0f9e91a4ff5f6
 +F src/vdbesort.c 74a41fcd3adc22bc47ede68443d0b3e26ae13bb8
  F src/vdbetrace.c 7e4222955e07dd707a2f360c0eb73452be1cb010
- F src/vtab.c ff722a886ed61e2e2889ee221b0a4f6dcaabb8e1
+ F src/vtab.c 9ca557215e8591ceb66e0b7c0a579c6df1e54b2d
  F src/vxworks.h c18586c8edc1bddbc15c004fa16aeb1e1342b4fb
  F src/wal.c 878c8e1a51cb2ec45c395d26b7d5cd9e1a098e4a
  F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
@@@ -1250,7 -1250,8 +1250,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 80a00539506c95443165a781d1d869205057ca6c 0a72726da21581ab16cb3e964bd825b8f2e931e4
- R 0ddadab44a50ca2385f4faee2452bd2a
 -P da49700ca148d91e1b8863c2eb6ee79144e83ac9 1a2e2803920dcf64190d81d8a487d6c3c9bb28ee
 -R c078ada2bdea31973177a0bd82842009
 -T +closed 1a2e2803920dcf64190d81d8a487d6c3c9bb28ee
 -U drh
 -Z 157b78d075c326a9e01bf8b58e910074
++P 60be9c1c1ad0d8250a99cadda820dff40a31c94e f9a3a8391c28cf13d76ec54f471735d35059acea
++R 8cc4453daf2856e557767a1f0d837e5c
 +U dan
- Z 2d4c23b7be7026ef7423fe176f4067b9
++Z 4b86d0a39011ed956c925ab41d27f3f5

diff --cc manifest.uuid
index fc8d4fdf741494af0bd3276d0355dcd9bece11d9,76f7b8530aac73c0cbd26e208223e139630aa321..ca024de15935c3e99bbb45c1e2dbede124e2789f
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 60be9c1c1ad0d8250a99cadda820dff40a31c94e
 -f9a3a8391c28cf13d76ec54f471735d35059acea
++cf7590f607d94a120385576b538484ca738349e2

diff --cc src/vdbe.c
Simple merge