Merge all recent trunk fixes and enhancements into the sessions branch.

FossilOrigin-Name: e65e65f9bc9b4bf5c9dd6e3a77a0d5f03c40e006

diff --cc manifest
index c0c41f3c07b08ac5e1e630aa2de4f2bf100a17d9,7337ec76734d5be15625dc7c61a39e62813940e2..f673b417e69017c4e4a12eda038ca976d551684f
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,12 -1,12 +1,12 @@@
- C Merge\sall\srecent\strunk\senhancements\sinto\sthe\ssessions\sbranch.
- D 2015-04-12T01:33:37.792
 -C Remove\san\sincorrect\sassert()\sstatement\sfrom\ssqlite3Fts3Dequote().
 -D 2015-04-15T09:16:39.633
++C Merge\sall\srecent\strunk\sfixes\sand\senhancements\sinto\sthe\ssessions\sbranch.
++D 2015-04-15T14:14:38.449
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in 5f78b1ab81b64e7c57a75d170832443e66c0880a
 +F Makefile.in 7e23076b9c9dd5c1901c78cf6cdd64d616e5a539
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 -F Makefile.msc 0078f5781538e07ea38683439f38d5f5ab79ab6e
 +F Makefile.msc 5b2ac9066d9d67427eb98d7e4bf3790c4db51810
  F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
  F README.md d58e3bebc0a4145e0f2a87994015fdb575a8e866
- F VERSION 319eb1ced4b4d17a67730f2b7b85f15c1346cb60
+ F VERSION 2e244662b71e6e68a5c29b014ebc5b7564f4cc5a
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F addopcodes.awk 9eb448a552d5c0185cf62c463f9c173cedae3811
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
@@@ -170,9 -152,9 +170,9 @@@ F ext/userauth/userauth.c 5fa3bdb492f48
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
 -F main.mk ddffac494a82d42772df9fe30d3a78acf4f7cb41
 +F main.mk 3ffc109d70c73c8c1149d7f9c880e22edb8d6c43
  F mkopcodec.awk c2ff431854d702cdd2d779c9c0d1f58fa16fa4ea
- F mkopcodeh.awk c6b3fa301db6ef7ac916b14c60868aeaec1337b5
+ F mkopcodeh.awk d5e22023b5238985bb54a72d33e0ac71fe4f8a32
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
  F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
  F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
@@@ -199,8 -181,8 +199,8 @@@ F src/callback.c 7b44ce59674338ad48b0e8
  F src/complete.c a5cf5b4b56390cfb7b8636e8f7ddef90258dd575
  F src/ctime.c 98f89724adc891a1a4c655bee04e33e716e05887
  F src/date.c e4d50b3283696836ec1036b695ead9a19e37a5ac
 -F src/delete.c 37964e6c1d73ff49cbea9ff690c9605fb15f600e
 +F src/delete.c 5075d88557eb4e2a7fdb2b61a96142830d8589b8
- F src/expr.c d09dac67d53c78880ba31d56e8ba2be3a6490553
+ F src/expr.c 8800584340a9b4f4c0ca55c360de751c6da0b11a
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c 3343d551a8d810782257244fb33f2ce191493c39
  F src/func.c 1414c24c873c48796ad45942257a179a423ba42f
@@@ -208,7 -190,7 +208,7 @@@ F src/global.c 4f77cadbc5427d00139ba43d
  F src/hash.c 4263fbc955f26c2e8cdc0cf214bc42435aa4e4f5
  F src/hash.h c8f3c31722cf3277d03713909761e152a5b81094
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
- F src/insert.c 7d953730a7b8e6ff5db0d5a372ebc303f85488b7
 -F src/insert.c 305dd3f9539d0affa4bf1c14cc7dffb34867e040
++F src/insert.c 6663d6885c1e28b503153ff5d817f61cdc1aa901
  F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
  F src/legacy.c ba1863ea58c4c840335a84ec276fc2b25e22bc4e
  F src/lempar.c 7274c97d24bb46631e504332ccd3bd1b37841770
@@@ -241,19 -223,19 +241,19 @@@ F src/parse.y 1299c66e7b1707322ccd8af43
  F src/pcache.c 10539fb959849ad6efff80050541cab3d25089d4
  F src/pcache.h b44658c9c932d203510279439d891a2a83e12ba8
  F src/pcache1.c 69d137620a305f814398bd29a0c998038c0695e9
- F src/pragma.c ac4f3f856b4234e85f55b0f069698a4766011100
+ F src/pragma.c 3965ae4e82bed39fb97ce04c5fe18c9bc3ee6a88
  F src/pragma.h 09c89bca58e9a44de2116cc8272b8d454657129f
  F src/prepare.c 173a5a499138451b2561614ecb87d78f9f4644b9
- F src/printf.c 8ae1fa9d30c1200a9268a390ba9e9cea9197b27a
+ F src/printf.c 08fa675c200aac29e561c6153f91f909ed17612f
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
- F src/resolve.c 41aa91af56d960e9414ce1d7c17cfb68e0d1c6cb
+ F src/resolve.c 66cfe49a9c3b449ef13b89a8c47036a4ed167eab
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
- F src/select.c c28c52e353287434fac8473e56ee4be848d12c9d
+ F src/select.c 93260bc9e7e0e6dfe1b7cb8815b0ed4cad8be9e3
 -F src/shell.c 84a1593bd86aaa14f4da8a8f9b16fbc239d262aa
 -F src/sqlite.h.in ca27603a36fcacdaac5a19d8ee35aaff8ce8516f
 +F src/shell.c c4d839ad62f4986891601a21ce629a760f226682
- F src/sqlite.h.in 64287a2b3432550264a743addbf4162a692fdd1c
++F src/sqlite.h.in 679a3abfef9c13a989728fd27f308a3e3f00e232
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
  F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d
 -F src/sqliteInt.h 90b7bfd89d7307cd0750663da419ba4bb81e7379
 +F src/sqliteInt.h f415bc20c6ac85a255f03aa145476655da6f4098
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c f266ad8a2892d659b74f0f50cb6a88b6e7c12179
  F src/table.c e7a09215315a978057fb42c640f890160dbcc45e
@@@ -305,20 -287,20 +305,20 @@@ F src/test_vfs.c b7e6831e6fcf04c5090acc
  F src/test_vfstrace.c bab9594adc976cbe696ff3970728830b4c5ed698
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
  F src/threads.c 6bbcc9fe50c917864d48287b4792d46d6e873481
- F src/tokenize.c a8d270b06e5f709930f7b67cf70a847969cb5bf3
+ F src/tokenize.c a8234a67577308935cdf13e618cd66556f5f45d1
  F src/trigger.c 69a91bed7c94e46223e37ffccfeeb35e34b999ac
 -F src/update.c 3c4ecc282accf12d39edb8d524cf089645e55a13
 +F src/update.c d207deb7a031f698104bee879de0632b611e72dd
  F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
  F src/util.c 98a7627ca48ad3265b6940915a1d08355eb3fc7e
  F src/vacuum.c 2ddd5cad2a7b9cef7f9e431b8c7771634c6b1701
- F src/vdbe.c e09d0a7738b0bc469c573d43af501835afa47956
 -F src/vdbe.c 3f3afd12d4794cb51fe13dc948b1172a5eb71a94
 -F src/vdbe.h 7e538ecf47dccb307ea2d087c3ddc2dd8d70e79d
 -F src/vdbeInt.h 9cbaa84f53ddd2d09a0cf61a94337a3a035d08a0
 -F src/vdbeapi.c 583d56b129dd27f12bed518270de9ebe521e6a75
 -F src/vdbeaux.c a20504ae52392459fa08402fda3f195f19d7c79d
 -F src/vdbeblob.c 4f2e8e075d238392df98c5e03a64342465b03f90
 -F src/vdbemem.c c0dc81285b7571b0a31c40f17846fe2397ec1cd9
++F src/vdbe.c f3f2e466c962cbb1f774526d24d963b06dd46a96
 +F src/vdbe.h 01d8c35cb877faca74331bb690f0327493c2cb50
 +F src/vdbeInt.h 96e4303a96c6f983e36e1fe32657b2c547f5c8f1
 +F src/vdbeapi.c d95f2bb43d01a91d93231cde181811b38182202e
 +F src/vdbeaux.c 70d414ecc1a345f71a52c7e5e4e1bdfa184081ca
 +F src/vdbeblob.c ab33f9b57cfce7dddb23853090186da614be4846
 +F src/vdbemem.c 149e585645c3f3ef063f2b7251646388cfe3d47d
- F src/vdbesort.c 5a729a15fb46b1759e13be49a10441172628e593
+ F src/vdbesort.c 2e7f683464fd5db3be4beaa1ff2d39e24fcb64b8
  F src/vdbetrace.c 7e4222955e07dd707a2f360c0eb73452be1cb010
  F src/vtab.c 9ca557215e8591ceb66e0b7c0a579c6df1e54b2d
  F src/vxworks.h c18586c8edc1bddbc15c004fa16aeb1e1342b4fb
@@@ -651,11 -633,11 +651,11 @@@ F test/fuzz_malloc.test 328f70aaca63adf
  F test/fuzzer1.test d4c52aaf3ef923da293a2653cfab33d02f718a36
  F test/fuzzerfault.test 8792cd77fd5bce765b05d0c8e01b9edcf8af8536
  F test/genesis.tcl 1e2e2e8e5cc4058549a154ff1892fe5c9de19f98
- F test/hexlit.test f9ecde8145bfc2341573473256c74ae37a200497
+ F test/hexlit.test 1d312fa816dfd3650a3bb488093bc09a0c927f67
 -F test/hook.test 162d7cef7a2d2b04839fe14402934e6a1b79442f
 +F test/hook.test aa41c095d26822b8a51aa4c82904a14347961be6
  F test/icu.test 70df4faca133254c042d02ae342c0a141f2663f4
  F test/imposter1.test c3f1db2d3db2c24611a6596a3fc0ffc14f1466c8
- F test/in.test 047c4671328e9032ab95666a67021adbbd36e98e
+ F test/in.test b52fa96bcf6cebc5c8829c822315d0f87af9c6c2
  F test/in2.test 5d4c61d17493c832f7d2d32bef785119e87bde75
  F test/in3.test 3cbf58c87f4052cee3a58b37b6389777505aa0c0
  F test/in4.test d2b38cba404bc4320f4fe1b595b3d163f212c068
@@@ -811,8 -793,8 +811,8 @@@ F test/pagesize.test 1dd51367e752e742f5
  F test/pcache.test b09104b03160aca0d968d99e8cd2c5b1921a993d
  F test/pcache2.test a83efe2dec0d392f814bfc998def1d1833942025
  F test/percentile.test 4243af26b8f3f4555abe166f723715a1f74c77ff
 -F test/permutations.test f9cc1dd987986c9d4949211c7a4ed55ec9aecba1
 +F test/permutations.test e5e9f708879336e10095ded8d61966007f4a2c5c
- F test/pragma.test ad99d05e411c7687302124be56f3b362204be041
+ F test/pragma.test e6605ce89c66db930aef561e43a22281a09ffc66
  F test/pragma2.test f624a496a95ee878e81e59961eade66d5c00c028
  F test/pragma3.test 6f849ccffeee7e496d2f2b5e74152306c0b8757c
  F test/printf.test b3ff34e73d59124140eaf89f7672e21bc2ca5fcc
@@@ -1258,10 -1239,10 +1258,10 @@@ F tool/speedtest2.tcl ee2149167303ba8e9
  F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c
- F tool/sqldiff.c 51c05cc1435507736b8b5a41a0498016041b3e48
+ F tool/sqldiff.c 5c16cf3a1f566873abbdecac0d13a6691437564f
  F tool/stack_usage.tcl f8e71b92cdb099a147dad572375595eae55eca43
  F tool/symbols-mingw.sh 4dbcea7e74768305384c9fd2ed2b41bbf9f0414d
 -F tool/symbols.sh fec58532668296d7c7dc48be9c87f75ccdb5814f
 +F tool/symbols.sh c5a617b8c61a0926747a56c65f5671ef8ac0e148
  F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
  F tool/varint.c 5d94cb5003db9dbbcbcc5df08d66f16071aee003
  F tool/vdbe-compress.tcl 5926c71f9c12d2ab73ef35c29376e756eb68361c
@@@ -1269,7 -1250,7 +1269,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 805baa57e5d2e97dccddc08eb72f2564df4802e8 e527d96a1e098ade4e9d124b630a8c2ea2ac9b36
- R 730bdca262b89d29bd7fd3c2449cd70e
 -P fa0956edf866f48f448967836709a3ad822ff917
 -R ae90fdb352a7af37163dde65a0adec8a
 -U dan
 -Z a5cd9462fba20ef05f7047cbd877b3d9
++P 5f14f34f072921e229bc20a5185c0cdb3f464c04 bd06eeb8d06237dc2d54d8a03e8bf525cb811c9e
++R 9a2dfdee602d304934edbae48280a16c
 +U drh
- Z 0af95f43348b30e9069146170d9a1be7
++Z 3665d5b1b05a141bd80e3d7f627d8145

diff --cc manifest.uuid
index 674856c814ad7760aa6aa1c746bdd99916f0a83a,6c106f0137fb94ad57d6eae52953f8cbc5dcafb1..bcb504ccb40e4b8c533a172d91a1df979f842be5
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 5f14f34f072921e229bc20a5185c0cdb3f464c04
 -bd06eeb8d06237dc2d54d8a03e8bf525cb811c9e
++e65e65f9bc9b4bf5c9dd6e3a77a0d5f03c40e006

diff --cc src/insert.c
Simple merge

diff --cc src/sqlite.h.in
Simple merge

diff --cc src/vdbe.c
Simple merge