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

FossilOrigin-Name: b8ef1cdee307441e8d97b4bfc21f8547692eea9f

diff --cc Makefile.in
Simple merge

diff --cc Makefile.msc
Simple merge

diff --cc main.mk
Simple merge

diff --cc manifest
index ee05b48b56a2de5b08463cbe40b17d81b4a1aea6,98ea026575cdbe1a68106bb2077ad08a8ab4bb35..f1af9cdda251ed8d23ef863a8dde85e8772fb9bb
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Hold\sthe\sdatabase\smutex\sfor\sthe\sduration\sof\ssqlite3session_diff().
- D 2015-04-17T11:31:08.304
 -C Add\san\sALWAYS()\saround\sa\snew\sbranch\sthat\swas\smade\sunreachable\sby\san\seven\nnewer\schange.
 -D 2015-04-20T01:13:33.830
++C Merge\sall\srecent\strunk\senhancements\sand\sfixes\sinto\sthe\ssessions\sbranch.
++D 2015-04-20T01:32:53.676
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in 7e23076b9c9dd5c1901c78cf6cdd64d616e5a539
 -F Makefile.in faaf75b89840659d74501bea269c7e33414761c1
++F Makefile.in 7599f0c96df628cd543884b1b2f2a2fbffd00079
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc 5b2ac9066d9d67427eb98d7e4bf3790c4db51810
 -F Makefile.msc a19bceec468fa18bb54df52257b1a2211e69172d
++F Makefile.msc e3ce8e0e4eb05e2fcf3828dec70678f2030c9c3f
  F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
  F README.md d58e3bebc0a4145e0f2a87994015fdb575a8e866
  F VERSION 2e244662b71e6e68a5c29b014ebc5b7564f4cc5a
@@@ -170,7 -152,7 +170,7 @@@ F ext/userauth/userauth.c 5fa3bdb492f48
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk 3ffc109d70c73c8c1149d7f9c880e22edb8d6c43
 -F main.mk 60aba7d38b9bd73e249693344dd8405aa24ac02a
++F main.mk 11a73bab5613d7a1554ac3376b7c99a3d9190037
  F mkopcodec.awk c2ff431854d702cdd2d779c9c0d1f58fa16fa4ea
  F mkopcodeh.awk d5e22023b5238985bb54a72d33e0ac71fe4f8a32
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
@@@ -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 8800584340a9b4f4c0ca55c360de751c6da0b11a
+ F src/expr.c 5555f768c05d7d4a7840c6c2e72ad7aecbe0fe54
  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 6663d6885c1e28b503153ff5d817f61cdc1aa901
 -F src/insert.c b152e71457c40a3967ceafa9e7cbbb52e9ead2c1
++F src/insert.c 57381264535195aa3d1f4ba86a7c084412fa7178
  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 c4e0387bc88c8e21e5ba653e2
  F src/pcache.c 10539fb959849ad6efff80050541cab3d25089d4
  F src/pcache.h b44658c9c932d203510279439d891a2a83e12ba8
  F src/pcache1.c 69d137620a305f814398bd29a0c998038c0695e9
- F src/pragma.c 3965ae4e82bed39fb97ce04c5fe18c9bc3ee6a88
+ F src/pragma.c 2a81f312cdb78bf0672a0484478ca3c1083028e9
  F src/pragma.h 09c89bca58e9a44de2116cc8272b8d454657129f
- F src/prepare.c 173a5a499138451b2561614ecb87d78f9f4644b9
+ F src/prepare.c 1fffbdcd6f8a0173a8f70d71f22528f4c0e1e3d3
  F src/printf.c 08fa675c200aac29e561c6153f91f909ed17612f
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
- F src/resolve.c 66cfe49a9c3b449ef13b89a8c47036a4ed167eab
+ F src/resolve.c 53486a98c17b7ae09b8c2b398013e973ce4c1aae
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
- F src/select.c 93260bc9e7e0e6dfe1b7cb8815b0ed4cad8be9e3
- F src/shell.c c4d839ad62f4986891601a21ce629a760f226682
+ F src/select.c 361dfc32244656bbe3f0e53d8ed791b3ec0c4be8
 -F src/shell.c 28b3e1174a7fc00155d7d00880a33589a88508c9
 -F src/sqlite.h.in ca27603a36fcacdaac5a19d8ee35aaff8ce8516f
++F src/shell.c 48f78c322ea9cba4d0d33bc3d83455f3674a40c2
 +F src/sqlite.h.in 679a3abfef9c13a989728fd27f308a3e3f00e232
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
  F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d
- F src/sqliteInt.h f415bc20c6ac85a255f03aa145476655da6f4098
 -F src/sqliteInt.h 3a1fccc2bb62ab16750730b6f6f24305e686a0ce
++F src/sqliteInt.h a146261a562d43a4a8ca348f77ca888b50af9b29
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c f266ad8a2892d659b74f0f50cb6a88b6e7c12179
  F src/table.c e7a09215315a978057fb42c640f890160dbcc45e
@@@ -305,22 -287,22 +305,22 @@@ 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 a8234a67577308935cdf13e618cd66556f5f45d1
- F src/trigger.c 69a91bed7c94e46223e37ffccfeeb35e34b999ac
+ F src/tokenize.c b7fb584c2be5ec39b6fdf04b185e7c6f33f8dc15
+ F src/trigger.c bc647c712454c9b209fac082bb82870b5fd6fa54
 -F src/update.c 3c4ecc282accf12d39edb8d524cf089645e55a13
 +F src/update.c d207deb7a031f698104bee879de0632b611e72dd
  F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
- F src/util.c 98a7627ca48ad3265b6940915a1d08355eb3fc7e
+ F src/util.c a6431c92803b975b7322724a7b433e538d243539
  F src/vacuum.c 2ddd5cad2a7b9cef7f9e431b8c7771634c6b1701
- F src/vdbe.c f3f2e466c962cbb1f774526d24d963b06dd46a96
 -F src/vdbe.c f0cf3cf527d5a40b8d5d2324fdbb31da6c90cd8b
 -F src/vdbe.h 7e538ecf47dccb307ea2d087c3ddc2dd8d70e79d
 -F src/vdbeInt.h 9cbaa84f53ddd2d09a0cf61a94337a3a035d08a0
 -F src/vdbeapi.c 583d56b129dd27f12bed518270de9ebe521e6a75
 -F src/vdbeaux.c 03591cca98ec50e1493043f0ff7abbece0b9c83d
 -F src/vdbeblob.c 4f2e8e075d238392df98c5e03a64342465b03f90
 -F src/vdbemem.c c0dc81285b7571b0a31c40f17846fe2397ec1cd9
++F src/vdbe.c e8f00a2ef92c484ce31cdf3f112b7e83cf4e1a6a
 +F src/vdbe.h 01d8c35cb877faca74331bb690f0327493c2cb50
 +F src/vdbeInt.h 96e4303a96c6f983e36e1fe32657b2c547f5c8f1
 +F src/vdbeapi.c d95f2bb43d01a91d93231cde181811b38182202e
- F src/vdbeaux.c 70d414ecc1a345f71a52c7e5e4e1bdfa184081ca
++F src/vdbeaux.c 4ccd9105cca5c2cbc0481034fd468e3aa184f48f
 +F src/vdbeblob.c ab33f9b57cfce7dddb23853090186da614be4846
 +F src/vdbemem.c 149e585645c3f3ef063f2b7251646388cfe3d47d
  F src/vdbesort.c 2e7f683464fd5db3be4beaa1ff2d39e24fcb64b8
- F src/vdbetrace.c 7e4222955e07dd707a2f360c0eb73452be1cb010
- F src/vtab.c 9ca557215e8591ceb66e0b7c0a579c6df1e54b2d
+ F src/vdbetrace.c f95c2dff9041fcf07f871789c22ebb0648ea0b7c
+ F src/vtab.c 5f81f8a59c1f5ddb94c918f25ed5d83578fcc633
  F src/vxworks.h c18586c8edc1bddbc15c004fa16aeb1e1342b4fb
  F src/wal.c 753995db83247f20361a8e8a874990b21a75abd9
  F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
@@@ -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 e6605ce89c66db930aef561e43a22281a09ffc66
+ F test/pragma.test be7195f0aa72bdb8a512133e9640ac40f15b57a2
  F test/pragma2.test f624a496a95ee878e81e59961eade66d5c00c028
  F test/pragma3.test 6f849ccffeee7e496d2f2b5e74152306c0b8757c
  F test/printf.test b3ff34e73d59124140eaf89f7672e21bc2ca5fcc
@@@ -927,10 -908,10 +927,10 @@@ F test/superlock.test 1cde669f68d2dd37d
  F test/sync.test a34cd43e98b7fb84eabbf38f7ed8f7349b3f3d85
  F test/syscall.test d2fdaad713f103ac611fe7ef9b724c7b69f8149c
  F test/sysfault.test fa776e60bf46bdd3ae69f0b73e46ee3977a58ae6
- F test/table.test 06271d61eb13871490d38168433c1ef3dd82bb2a
+ F test/table.test bd841e8df69b99172ce9c7d53587463913d711ca
  F test/tableapi.test 2674633fa95d80da917571ebdd759a14d9819126
  F test/tableopts.test dba698ba97251017b7c80d738c198d39ab747930
 -F test/tclsqlite.test 7fb866443c7deceed22b63948ccd6f76b52ad054
 +F test/tclsqlite.test 7179b4e0bf236ddf0bfa6bfaefa76fbe0a23c28a
  F test/tempdb.test 19d0f66e2e3eeffd68661a11c83ba5e6ace9128c
  F test/temptable.test d2c9b87a54147161bcd1822e30c1d1cd891e5b30
  F test/temptrigger.test 8ec228b0db5d7ebc4ee9b458fc28cb9e7873f5e1
@@@ -1258,10 -1240,10 +1259,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 5c16cf3a1f566873abbdecac0d13a6691437564f
+ F tool/sqldiff.c 393b0f5b17ef29341664563a90d40ee63a0a18f7
  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 -1251,7 +1270,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 abb192a1d79388d4717f459b91e34f9c035935f2
- R 39574ad38832f7643b0bd124d608871c
- U dan
- Z 2a1b149e99da178a1dea33510073d75a
 -P c83052e48bbae0f45db2a44155b4e5482ee4a901
 -R 952a9e0aae8c56d03933920a47e90909
++P 6f33050115562833c43da3c99dd37aeb0bf966b6 592c010478fba7410424f011a62e019c826f1ac3
++R 6536f8d8e866d42286c94c8633072675
+ U drh
 -Z b000b63de0ad5ddbe40a2bc087fe2878
++Z 7d8304bb308c3b4144af41f71be18f06

diff --cc manifest.uuid
index db862f34a6daa68a537cb26314fb76505cdca23a,0e878dee1e1b21660b3d8b661e90fe0127104c41..13bc2f22ab876bf0d6ea47c01c22d8c38a3fff97
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 6f33050115562833c43da3c99dd37aeb0bf966b6
 -592c010478fba7410424f011a62e019c826f1ac3
++b8ef1cdee307441e8d97b4bfc21f8547692eea9f

diff --cc src/insert.c
Simple merge

diff --cc src/shell.c
Simple merge

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc src/vdbeaux.c
Simple merge