Merge the latest trunk enhancements and fixes into the sessions branch.

FossilOrigin-Name: 4e5f17d189eb0578a544c21fc150f9e2ee3428e3

diff --cc Makefile.msc
Simple merge

diff --cc manifest
index f1af9cdda251ed8d23ef863a8dde85e8772fb9bb,d1717e9040c08d2767c6f97d3854d9727259596c..3a0b76390b07e2488d143869cd2eacc99a2fb9b4
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Merge\sall\srecent\strunk\senhancements\sand\sfixes\sinto\sthe\ssessions\sbranch.
- D 2015-04-20T01:32:53.676
 -C Fix\sa\sfaulty\sassert()\sin\sthe\s"AS"\salias\sresolution\slogic\sof\sthe\sparser.
 -D 2015-04-23T13:37:05.307
++C Merge\sthe\slatest\strunk\senhancements\sand\sfixes\sinto\sthe\ssessions\sbranch.
++D 2015-04-23T13:49:53.138
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in faaf75b89840659d74501bea269c7e33414761c1
 +F Makefile.in 7599f0c96df628cd543884b1b2f2a2fbffd00079
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc e3ce8e0e4eb05e2fcf3828dec70678f2030c9c3f
 -F Makefile.msc 32d8fe89ac5c130f9f14293fb4a59b120895c943
++F Makefile.msc d775d530a1a2572c049aaceca22d5db3f1c37b64
  F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
  F README.md d58e3bebc0a4145e0f2a87994015fdb575a8e866
  F VERSION 2e244662b71e6e68a5c29b014ebc5b7564f4cc5a
@@@ -199,16 -181,16 +199,16 @@@ 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 5555f768c05d7d4a7840c6c2e72ad7aecbe0fe54
+ F src/expr.c 4c05a28eebe63b288fda1db0e8de556a82ca2ec6
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
- F src/fkey.c 3343d551a8d810782257244fb33f2ce191493c39
+ F src/fkey.c c9b63a217d86582c22121699a47f22f524608869
  F src/func.c 1414c24c873c48796ad45942257a179a423ba42f
  F src/global.c 4f77cadbc5427d00139ba43d0f3979804cbb700e
  F src/hash.c 4263fbc955f26c2e8cdc0cf214bc42435aa4e4f5
  F src/hash.h c8f3c31722cf3277d03713909761e152a5b81094
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
- F src/insert.c 57381264535195aa3d1f4ba86a7c084412fa7178
 -F src/insert.c 8176ba5bad8fcef643558ca5708f33ed05a4035a
++F src/insert.c 533e0f08a2e695cbd67c6a3d1067e106905f11f3
  F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
  F src/legacy.c ba1863ea58c4c840335a84ec276fc2b25e22bc4e
  F src/lempar.c 7274c97d24bb46631e504332ccd3bd1b37841770
@@@ -246,18 -228,18 +246,18 @@@ F src/pragma.h 09c89bca58e9a44de2116cc8
  F src/prepare.c 1fffbdcd6f8a0173a8f70d71f22528f4c0e1e3d3
  F src/printf.c 08fa675c200aac29e561c6153f91f909ed17612f
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
- F src/resolve.c 53486a98c17b7ae09b8c2b398013e973ce4c1aae
+ F src/resolve.c 13109bc3b5ab404446296efa17039640de5bc35d
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
- F src/select.c 361dfc32244656bbe3f0e53d8ed791b3ec0c4be8
- F src/shell.c 48f78c322ea9cba4d0d33bc3d83455f3674a40c2
+ F src/select.c 35433ea8894ac42594ddc31eb0165a6d6401cfe5
 -F src/shell.c 78eabce4c16c45e36fea2368f95118116399ba8a
 -F src/sqlite.h.in ca27603a36fcacdaac5a19d8ee35aaff8ce8516f
++F src/shell.c a412c46fdd2ccc19757eada50d434241cb6e2e6f
 +F src/sqlite.h.in 679a3abfef9c13a989728fd27f308a3e3f00e232
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
  F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d
- F src/sqliteInt.h a146261a562d43a4a8ca348f77ca888b50af9b29
 -F src/sqliteInt.h 8abcea1295138f10ef8f7ed38db5f1b573b93ece
++F src/sqliteInt.h 205ef3fbb28a6c82d295baa17e2c41f523fa9201
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c f266ad8a2892d659b74f0f50cb6a88b6e7c12179
  F src/table.c e7a09215315a978057fb42c640f890160dbcc45e
- F src/tclsqlite.c 7ed2644b48685cba250eb71c7c298fedab6e221a
 -F src/tclsqlite.c 14f1992dd6100bfeb1a3dec7e7f449e1c814b8ee
++F src/tclsqlite.c 9039c3559c0126d04aceb39dca63f02e4b9143ac
  F src/test1.c 90fbedce75330d48d99eadb7d5f4223e86969585
  F src/test2.c 577961fe48961b2f2e5c8b56ee50c3f459d3359d
  F src/test3.c 64d2afdd68feac1bb5e2ffb8226c8c639f798622
@@@ -306,18 -288,18 +306,18 @@@ F src/test_vfstrace.c bab9594adc976cbe6
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
  F src/threads.c 6bbcc9fe50c917864d48287b4792d46d6e873481
  F src/tokenize.c b7fb584c2be5ec39b6fdf04b185e7c6f33f8dc15
- F src/trigger.c bc647c712454c9b209fac082bb82870b5fd6fa54
+ F src/trigger.c 322f23aad694e8f31d384dcfa386d52a48d3c52f
 -F src/update.c 3c4ecc282accf12d39edb8d524cf089645e55a13
 +F src/update.c d207deb7a031f698104bee879de0632b611e72dd
  F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
  F src/util.c a6431c92803b975b7322724a7b433e538d243539
  F src/vacuum.c 2ddd5cad2a7b9cef7f9e431b8c7771634c6b1701
 -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 b5256445b318b0f2b3bc429028469cfbb08f19a5
 +F src/vdbe.c e8f00a2ef92c484ce31cdf3f112b7e83cf4e1a6a
 +F src/vdbe.h 01d8c35cb877faca74331bb690f0327493c2cb50
 +F src/vdbeInt.h 96e4303a96c6f983e36e1fe32657b2c547f5c8f1
 +F src/vdbeapi.c d95f2bb43d01a91d93231cde181811b38182202e
 +F src/vdbeaux.c 4ccd9105cca5c2cbc0481034fd468e3aa184f48f
 +F src/vdbeblob.c ab33f9b57cfce7dddb23853090186da614be4846
- F src/vdbemem.c 149e585645c3f3ef063f2b7251646388cfe3d47d
++F src/vdbemem.c 6a4802a9d59195c98fdeb6e226f91f637b3121f8
  F src/vdbesort.c 2e7f683464fd5db3be4beaa1ff2d39e24fcb64b8
  F src/vdbetrace.c f95c2dff9041fcf07f871789c22ebb0648ea0b7c
  F src/vtab.c 5f81f8a59c1f5ddb94c918f25ed5d83578fcc633
@@@ -1235,10 -1217,10 +1236,10 @@@ F tool/mkopts.tcl 66ac10d240cc6e86abd37
  F tool/mkpragmatab.tcl 94f196c9961e0ca3513e29f57125a3197808be2d
  F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
  F tool/mksqlite3c-noext.tcl 69bae8ce4aa52d2ff82d4a8a856bf283ec035b2e
 -F tool/mksqlite3c.tcl 52a3352f7aa15f1db851e45ac3a5e2173d6fe93c
 -F tool/mksqlite3h.tcl 44730d586c9031638cdd2eb443b801c0d2dbd9f8
 +F tool/mksqlite3c.tcl ebbf1198e19d84b4c34cca077d8f727a06ff8a11
 +F tool/mksqlite3h.tcl 96d92fcac21c6037d9db20c7cb2e06b534b550ac
  F tool/mksqlite3internalh.tcl eb994013e833359137eb53a55acdad0b5ae1049b
- F tool/mkvsix.tcl 52a4c613707ac34ae9c226e5ccc69cb948556105
+ F tool/mkvsix.tcl 3b58b9398f91c7dbf18d49eb87cefeee9efdbce1
  F tool/offsets.c fe4262fdfa378e8f5499a42136d17bf3b98f6091
  F tool/omittest.tcl 34d7ac01fe4fd18e3637f64abe12c40eca0f6b97
  F tool/opcodeDoc.awk b3a2a3d5d3075b8bd90b7afe24283efdd586659c
@@@ -1270,7 -1252,7 +1271,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 6f33050115562833c43da3c99dd37aeb0bf966b6 592c010478fba7410424f011a62e019c826f1ac3
- R 6536f8d8e866d42286c94c8633072675
 -P 01c50cee37bfaddfecdda014728c35a1be1d991a
 -R b16870d1654f6de484a72bbc7fa9d1f0
++P b8ef1cdee307441e8d97b4bfc21f8547692eea9f b5e43602833249aa4b73337bf85b7f308450dab6
++R 21546caf070f5228972b31b0602e8636
  U drh
- Z 7d8304bb308c3b4144af41f71be18f06
 -Z cee60c918913e56f32da2a16c41282ec
++Z 47f4cbb84ecfe918df05ce03c5e0cd26

diff --cc manifest.uuid
index 13bc2f22ab876bf0d6ea47c01c22d8c38a3fff97,77658405b16edb8871fdec4f21c98b6c33a943e9..f5eb0529793abd1758cda42a8f409bef724cd711
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- b8ef1cdee307441e8d97b4bfc21f8547692eea9f
 -b5e43602833249aa4b73337bf85b7f308450dab6
++4e5f17d189eb0578a544c21fc150f9e2ee3428e3

diff --cc src/insert.c
Simple merge

diff --cc src/shell.c
Simple merge

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/tclsqlite.c
Simple merge

diff --cc src/vdbemem.c
Simple merge