Update this branch with latest trunk changes.

FossilOrigin-Name: 60be9c1c1ad0d8250a99cadda820dff40a31c94e

diff --cc manifest
index f9ce3a510de466f21e59093382d010a92110d0f7,b5170f22828517d3cef74fa63873628317378cbc..bd566ce541a5052b897f8c37275ac6bb6f69bee6
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Fix\sa\sproblem\sin\svdbesort.c\sto\sdo\swith\scaching\sunpacked\srecords.
- D 2015-04-02T09:06:21.116
 -C Do\snot\sallow\svirtual\stable\sconstructors\sto\sbe\scalled\srecursively.
 -D 2015-04-10T07:55:07.186
++C Update\sthis\sbranch\swith\slatest\strunk\schanges.
++D 2015-04-10T08:20:42.809
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in 00d12636df7a5b08af09116bcd6c7bfd49b8b3b4
+ F Makefile.in 5f78b1ab81b64e7c57a75d170832443e66c0880a
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc a8d817fa486d8c88dfbd19ae6a6567d9d350de39
+ F Makefile.msc fa6a6de11af800d89f86e8a4266fd40a46008347
  F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
  F README.md d58e3bebc0a4145e0f2a87994015fdb575a8e866
  F VERSION 319eb1ced4b4d17a67730f2b7b85f15c1346cb60
@@@ -176,9 -176,9 +176,9 @@@ F src/btmutex.c 45a968cc85afed9b5e6cf55
  F src/btree.c 2caf598165f3608fde8abac2b243826616ce54b7
  F src/btree.h 969adc948e89e449220ff0ff724c94bb2a52e9f1
  F src/btreeInt.h 973a22a6fd61350b454ad614832b1f0a5e25a1e4
- F src/build.c 9103f5cd8f4071dc0c44a3312956e53f5b7f52c8
 -F src/build.c 4a6d573cd5f77812f32d343134b429046946d560
++F src/build.c fa4795bc795077388aa4e746e1b25ef97bc10489
  F src/callback.c 7b44ce59674338ad48b0e84e7b72f935ea4f68b0
- F src/complete.c 198a0066ba60ab06fc00fba1998d870a4d575463
+ F src/complete.c a5cf5b4b56390cfb7b8636e8f7ddef90258dd575
  F src/ctime.c 98f89724adc891a1a4c655bee04e33e716e05887
  F src/date.c e4d50b3283696836ec1036b695ead9a19e37a5ac
  F src/delete.c 37964e6c1d73ff49cbea9ff690c9605fb15f600e
@@@ -235,7 -235,7 +235,7 @@@ F src/shell.c 84a1593bd86aaa14f4da8a8f9
  F src/sqlite.h.in 278602140d49575e8708e643161f4263e428a02a
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
  F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d
- F src/sqliteInt.h c0437537f4e69993a923cb0a4e74542a4d128784
 -F src/sqliteInt.h 107b02ed6c64162b653acc2368e982de529e14f6
++F src/sqliteInt.h 90b7bfd89d7307cd0750663da419ba4bb81e7379
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c f266ad8a2892d659b74f0f50cb6a88b6e7c12179
  F src/table.c e7a09215315a978057fb42c640f890160dbcc45e
@@@ -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 86ae6f4774410868af41bd839b72b7081ff03e78
 -F src/vdbe.h 6fc69d9c5e146302c56e163cb4b31d1ee64a18c3
 +F src/vacuum.c 2ddd5cad2a7b9cef7f9e431b8c7771634c6b1701
 +F src/vdbe.c f6647e7426b70826a03e69bd295d18c93ff5ae07
 +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 62d49237bd8f3be4863815a39387b0f9897fa5e1
+ F src/vtab.c ff722a886ed61e2e2889ee221b0a4f6dcaabb8e1
  F src/vxworks.h c18586c8edc1bddbc15c004fa16aeb1e1342b4fb
  F src/wal.c 878c8e1a51cb2ec45c395d26b7d5cd9e1a098e4a
  F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
@@@ -1248,7 -1250,7 +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 4621b2eef8be6d944f87de097bd11c649fe43333
- R 0796456518338cd116674974cfde4890
 -P ee53b46011852e27db23708387fe1e918cc8284c
 -R 7e9242555b174ae9f2c42129917fe80c
++P 80a00539506c95443165a781d1d869205057ca6c 0a72726da21581ab16cb3e964bd825b8f2e931e4
++R 0ddadab44a50ca2385f4faee2452bd2a
  U dan
- Z 0cef8df18e8711c69cda8f5613bc4995
 -Z a71357da8ab26f740f6d9ebc28389132
++Z 2d4c23b7be7026ef7423fe176f4067b9

diff --cc manifest.uuid
index 0941cff2b991fbde32a02e86a093e78894ec6c8d,6d3ce3f223d354702c2cf8784a1106eafea09361..fc8d4fdf741494af0bd3276d0355dcd9bece11d9
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 80a00539506c95443165a781d1d869205057ca6c
 -0a72726da21581ab16cb3e964bd825b8f2e931e4
++60be9c1c1ad0d8250a99cadda820dff40a31c94e

diff --cc src/build.c
Simple merge

diff --cc src/sqliteInt.h
Simple merge