Merge recent enhancements from trunk, and especially the fix for

ticket [1b266395d6bc10].

FossilOrigin-Name: b2face9aa95ade96a5666c70b6b31064c1ad0977

diff --cc Makefile.in
index a10705e7f58aae5700e66e8ab46885b07e8e3d0e,5c78abde946428b2d35a37bc3d9fa38bff323208..d34ee84fb2c28514013fa8c52a6f716e8a968853
--- 1/Makefile.in
--- 2/Makefile.in
+++ b/Makefile.in
@@@ -631,8 -624,10 +631,11 @@@ mptest:  mptester$(TEXE
  sqlite3.c:    .target_source $(TOP)/tool/mksqlite3c.tcl
        $(TCLSH_CMD) $(TOP)/tool/mksqlite3c.tcl
        cp tsrc/shell.c tsrc/sqlite3ext.h .
 +      cp $(TOP)/ext/session/sqlite3session.h .
  
+ sqlite3ext.h: .target_source
+       cp tsrc/sqlite3ext.h .
+ 
  tclsqlite3.c: sqlite3.c
        echo '#ifndef USE_SYSTEM_SQLITE' >tclsqlite3.c
        cat sqlite3.c >>tclsqlite3.c

diff --cc Makefile.msc
Simple merge

diff --cc main.mk
Simple merge

diff --cc manifest
index 248e5f6dc33ed993f54345da4c91d85d5d3ac920,b92913e6d53492446bc269ae367e5210d54a2576..bcf5b0db01d06ab063ccf5320c0616207d878c55
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Merge\sall\sthe\slatest\strunk\senhancements\sinto\sthe\ssessions\sbranch.
- D 2015-09-24T14:26:51.287
 -C Add\sa\scorrupt\sdatabase\sto\stest/fuzzdata3.db\sto\svalidate\sthe\sprevious\ncheck-in.
 -D 2015-09-30T14:30:19.646
++C Merge\srecent\senhancements\sfrom\strunk,\sand\sespecially\sthe\sfix\sfor\nticket\s[1b266395d6bc10].
++D 2015-09-30T14:50:39.955
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in 5bda8cc6bbd2be407f4ef679f4f235ba47c7a3c0
 -F Makefile.in 2143eeef6d0cc26006ae5fc4bb242a4a8b973412
++F Makefile.in fdcfdc361f0a3723da9b48b967f259f7aaff3ad5
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc fd760727d07ba21b5f779c6a056a0c6ea7f40979
 -F Makefile.msc b9054642ab305be4174d8b0433c9951c2839701d
++F Makefile.msc 2f913bc2229596a31ec1025ce34aef9634164a6a
  F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION ccfc4d1576dbfdeece0a4372a2e6a2e37d3e7975
@@@ -280,7 -261,7 +280,7 @@@ F ext/userauth/userauth.c 5fa3bdb492f48
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk 284e224af00642c0e5e9454c4b07ec5c2d7860d5
 -F main.mk 151fcaba704fdeeb0a1941857ef6e1d6216732d8
++F main.mk f0a074da8e55de2646bc3aca50f13989d4558c1e
  F mkopcodec.awk c2ff431854d702cdd2d779c9c0d1f58fa16fa4ea
  F mkopcodeh.awk 0e7f04a8eb90f92259e47d80110e4e98d7ce337a
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
@@@ -310,21 -291,21 +310,21 @@@ F src/complete.c addcd8160b081131005d5b
  F src/ctime.c 5a0b735dc95604766f5dac73973658eef782ee8b
  F src/date.c fb1c99172017dcc8e237339132c91a21a0788584
  F src/dbstat.c e637e7a7ff40ef32132a418c6fdf1cfb63aa27c7
- F src/delete.c d14f86935c7ff120f04532af8332c2ca21a7af0c
- F src/expr.c 3a76afcdac925294c39903b7002ddb9e5fd29863
 -F src/delete.c 35c939eb8bacc9dd8a6715964e5f69feb8c20e44
++F src/delete.c 4545c9f793f27d14a32195f6a0b121913a80f692
+ F src/expr.c 36381822e617cb3586d4be1af2cbc3dd5f2b84eb
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
- F src/fkey.c 83e1baba999bed3144ea5a2143fc922edf51135f
+ F src/fkey.c 31900763094a3736a5fc887469202eb579fef2d0
  F src/func.c ecdd69ec6a1e406f04cc73324be2ebbf6354197f
  F src/global.c 508e4087f7b41d688e4762dcf4d4fe28cfbc87f9
  F src/hash.c 4263fbc955f26c2e8cdc0cf214bc42435aa4e4f5
  F src/hash.h c8f3c31722cf3277d03713909761e152a5b81094
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
- F src/insert.c 7708c63195ba6397325fe64b8442085e73da6851
 -F src/insert.c a9b7f200081fa1b482a4ccac05165e10371ae9e0
++F src/insert.c a1e265bbe11d179cb5dc61541e927c6d4f0d04bd
  F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
  F src/legacy.c ba1863ea58c4c840335a84ec276fc2b25e22bc4e
  F src/lempar.c d344a95d60c24e2f490ee59db9784b1b17439012
  F src/loadext.c f0b66d28e377fd6c6d36cc9d92df1ff251ebee44
- F src/main.c 9e2e596c97401a7b99f2f500f5e2c725d53eabe2
 -F src/main.c c80ea19ec71609ccbec21f334fbcf475bb6af2fc
++F src/main.c 34206b735954c44defba8f324b613e5d5de89ce3
  F src/malloc.c 3a37ce6979a40f499d8cea9e9ab4e8517854d35d
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c abe6ee469b6c5a35c7f22bfeb9c9bac664a1c987
@@@ -359,12 -340,12 +359,12 @@@ F src/printf.c 0c4bcdd1c2e2521024f0a69c
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
  F src/resolve.c 1954a0f01bf65d78d7d559aea3d5c67f33376d91
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
- F src/select.c 36ee14d729e182cd8b6796f980b7ab3fc9bcee72
- F src/shell.c 2b29a6f5c1b431eb0d25196e249d7e69b68d5ef0
- F src/sqlite.h.in 627e991195047aebc49f3c895d458f9ac2805e4a
+ F src/select.c e49f4af9748c9e0cc1bf864b4190aa94841c8409
 -F src/shell.c dfd18e56fcb88dd79378774e9bc3246a9bd52243
 -F src/sqlite.h.in 4b76d74d69af48c534c58fb723137dc6944bdedc
++F src/shell.c f38cfe6a0b971d50158e71880852119bdca89ce9
++F src/sqlite.h.in 8f4deb5874227c7635300fb75105ff6e92131fb5
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
  F src/sqlite3ext.h 64350bf36833a56ad675e27392a913f417c5c308
- F src/sqliteInt.h 211b8080f46e7cda9f6df9ab590a7aec1b51d999
 -F src/sqliteInt.h 681f38fc0decba6edcf3bad230e76fa5bf55a7bf
++F src/sqliteInt.h a6edcbabcd78cfd888f74aaedb2160241a38294f
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c f266ad8a2892d659b74f0f50cb6a88b6e7c12179
  F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e
@@@ -418,20 -399,20 +418,20 @@@ F src/threads.c bbfb74450643cb5372a43ad
  F src/tokenize.c 83c6ed569423a3af83a83973b444cf7123be33a6
  F src/treeview.c 154f0acc622fa3514de8777dcedf4c8a8802b4ce
  F src/trigger.c 322f23aad694e8f31d384dcfa386d52a48d3c52f
- F src/update.c 04a06489008ad1d6007e6de3fbe4caed7c6c620b
 -F src/update.c a134027f59c7eb6e63ed18e2d5dd8ef0ce7f8ff8
++F src/update.c 9e102cc3d8732aeb6b977569c8ce1f73fb0031bd
  F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
  F src/util.c fc612367108b74573c5fd13a85d0a23027f438bd
  F src/vacuum.c 2ddd5cad2a7b9cef7f9e431b8c7771634c6b1701
 -F src/vdbe.c 5048103aa6bc9c01bf1a4620729256d1e873bb6c
 -F src/vdbe.h 4bc88bd0e06f8046ee6ab7487c0015e85ad949ad
 -F src/vdbeInt.h 8b867eac234e28627ffcace3cd4b4b79bbec664b
 -F src/vdbeapi.c 020681b943e77766b32ae1cddf86d7831b7374ca
 -F src/vdbeaux.c fd00b489ab3f44f2dca1e4344faf289b7bfcf649
 -F src/vdbeblob.c 565fabd302f5fca3bdf3d56cac330483616a39b6
 -F src/vdbemem.c 19b3036aa4d676e7103b0fb5efd6327da455f915
 +F src/vdbe.c b61897b3e827e600f2a773031326471e49205fa5
 +F src/vdbe.h 67151895e779b35475c6c11b16be2ceb839066c8
 +F src/vdbeInt.h 42fa34502937071aabd3c0596575ba9776547353
 +F src/vdbeapi.c f5eda36a5c85ef578957ab4311e8d9b1f51a3552
 +F src/vdbeaux.c 4cbd4cc79dad0e2c2b9996ae018d79a7330110f4
- F src/vdbeblob.c 53ed7f38ab93922038bcfa17aae514dc47752f1e
++F src/vdbeblob.c b400c25ac822af3c507ef84b5cd93c1583a70321
 +F src/vdbemem.c 28ab8455ac490373798cf2c21def2c1287942551
  F src/vdbesort.c f5009e7a35e3065635d8918b9a31f498a499976b
  F src/vdbetrace.c 8befe829faff6d9e6f6e4dee5a7d3f85cc85f1a0
- F src/vtab.c 2ecfe020c10e0a0c7b078203fdba2fae844744bc
+ F src/vtab.c 9a6d8818c8a2477ce547f064701b5e955b25d894
  F src/vxworks.h c18586c8edc1bddbc15c004fa16aeb1e1342b4fb
  F src/wal.c 18b0ed49830cf04fe2d68224b41838a73ac6cd24
  F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
@@@ -1408,7 -1389,7 +1409,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P b7469c44be77358e02892a3abc696f7caa0dcd3b c6ab807b72ddfc1462f61aa91442b6fac04ace8a
- R 1b640a6d419521daa5b2a632ced07132
 -P 29f7227ff127202c53fe7c3b6558b3c101b0a7bc
 -R b3d2e18288eecf437c1dfdc1db967b0d
++P c91065f8edb1e54076791716fc20d3fcfe3070dc e796c0efb6cf17444b53af75046daf7d8fa82f78
++R 0237333bf6dc63bf0c4f4c66d7918366
  U drh
- Z b4a9ac9211cc2ca2704bd7cc4c9b5b17
 -Z 07034a5cbcc5358cdbeac30192aaba95
++Z 5f6cedfd7517312f688a69652091b608

diff --cc manifest.uuid
index 5cc71bdd0b551fe2aab8dfc1b90f72ded66b38b5,956cc32adcc40480ac27abc1796b69b3906d0933..75c74a20e29bcf8cb02d40b03c4c01746d00e13f
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- c91065f8edb1e54076791716fc20d3fcfe3070dc
 -e796c0efb6cf17444b53af75046daf7d8fa82f78
++b2face9aa95ade96a5666c70b6b31064c1ad0977

diff --cc src/delete.c
Simple merge

diff --cc src/insert.c
Simple merge

diff --cc src/main.c
Simple merge

diff --cc src/shell.c
Simple merge

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

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/update.c
Simple merge

diff --cc src/vdbeblob.c
Simple merge