Merge all the latest trunk enhancements into the sessions branch.

FossilOrigin-Name: c91065f8edb1e54076791716fc20d3fcfe3070dc

diff --cc Makefile.in
Simple merge

diff --cc Makefile.msc
index f8bb61d9b7afb99c2af197f5e79d1352d3f61d27,7e6958970519ff21869ffc8fa1d46adfd214ba87..7f4ef98ab034b925bf3a1fe4a3d145e1393583ee
--- 1/Makefile.msc
--- 2/Makefile.msc
+++ b/Makefile.msc
@@@ -1298,11 -1282,9 +1306,10 @@@ mptest:       mptester.ex
        move vdbe.new tsrc\vdbe.c
        echo > .target_source
  
- sqlite3.c:    .target_source $(TOP)\tool\mksqlite3c.tcl
+ sqlite3.c:    .target_source sqlite3ext.h $(TOP)\tool\mksqlite3c.tcl
        $(TCLSH_CMD) $(TOP)\tool\mksqlite3c.tcl $(MKSQLITE3C_ARGS)
        copy tsrc\shell.c .
-       copy tsrc\sqlite3ext.h .
 +      copy $(TOP)\ext\session\sqlite3session.h .
  
  sqlite3-all.c:        sqlite3.c $(TOP)\tool\split-sqlite3c.tcl
        $(TCLSH_CMD) $(TOP)\tool\split-sqlite3c.tcl

diff --cc main.mk
Simple merge

diff --cc manifest
index 6e3727b25d5d1762d86ab33f7ace8efa9982fc91,54da3e34203fed26268a36e564bb8b0320598d9c..248e5f6dc33ed993f54345da4c91d85d5d3ac920
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Merge\sthe\slatest\strunk\senhancements\swith\sthis\sbranch.
- D 2015-09-15T15:55:15.671
 -C Strengthen\sthe\simplementations\sof\sxShmMemoryBarrier\son\sboth\sthe\sunix\sand\nwindows\sVFSes,\sso\sthat\sthey\slikely\swork\seven\sif\sSQLITE_THREADSAFE=0\sis\sused.
 -D 2015-09-24T12:40:43.573
++C Merge\sall\sthe\slatest\strunk\senhancements\sinto\sthe\ssessions\sbranch.
++D 2015-09-24T14:26:51.287
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in 00b690660681c22e7ce3a9cbebd69894766ebbd8
 -F Makefile.in e1afa6fb2de2bddd50e0ddae8166c2ee9d69b301
++F Makefile.in 5bda8cc6bbd2be407f4ef679f4f235ba47c7a3c0
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc a71cfab97780281290f01b212f907d6d438b7e2d
 -F Makefile.msc f090cdf036f3c07fb13aa2f4494e388c0b1ed1e4
++F Makefile.msc fd760727d07ba21b5f779c6a056a0c6ea7f40979
  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 ffd9a2beb9583da4c54fcd811daf4c770bf9bcfe
 -F main.mk d12601118f1d1dadebe1329a53a6d5c512b36d44
++F main.mk 284e224af00642c0e5e9454c4b07ec5c2d7860d5
  F mkopcodec.awk c2ff431854d702cdd2d779c9c0d1f58fa16fa4ea
  F mkopcodeh.awk 0e7f04a8eb90f92259e47d80110e4e98d7ce337a
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
@@@ -310,7 -291,7 +310,7 @@@ F src/complete.c addcd8160b081131005d5b
  F src/ctime.c 5a0b735dc95604766f5dac73973658eef782ee8b
  F src/date.c fb1c99172017dcc8e237339132c91a21a0788584
  F src/dbstat.c e637e7a7ff40ef32132a418c6fdf1cfb63aa27c7
- F src/delete.c fb64e308242aa09a47a874f5fd45aa00249208be
 -F src/delete.c 371df4fc86e96efeaed3d37565aef77f956be109
++F src/delete.c d14f86935c7ff120f04532af8332c2ca21a7af0c
  F src/expr.c 3a76afcdac925294c39903b7002ddb9e5fd29863
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c 83e1baba999bed3144ea5a2143fc922edf51135f
@@@ -357,14 -338,14 +357,14 @@@ F src/pragma.h 631a91c8b0e6ca8f051a1d8a
  F src/prepare.c 82e5db1013846a819f198336fed72c44c974e7b1
  F src/printf.c 0c4bcdd1c2e2521024f0a69cb5eb334f86b3652a
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
- F src/resolve.c 3126f7694b8ce0f97282d7dd3a5198b8fa18dce9
+ F src/resolve.c 1954a0f01bf65d78d7d559aea3d5c67f33376d91
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
- F src/select.c c17613385bc6b095c421b1f30548814f5fd8a9b2
+ F src/select.c 36ee14d729e182cd8b6796f980b7ab3fc9bcee72
 -F src/shell.c 6332ef06db1390ef812cfdff1fc97b4fd76cdd42
 -F src/sqlite.h.in 4e06cb5fed36736242c66237991db6f3e2395eb9
 +F src/shell.c 2b29a6f5c1b431eb0d25196e249d7e69b68d5ef0
- F src/sqlite.h.in 6ee38de04d4836a0a5171482aa1655eb70aa4ff9
++F src/sqlite.h.in 627e991195047aebc49f3c895d458f9ac2805e4a
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
  F src/sqlite3ext.h 64350bf36833a56ad675e27392a913f417c5c308
 -F src/sqliteInt.h 5afc6e50402be1e0a870f28e1cd8b32eb9db590f
 +F src/sqliteInt.h 211b8080f46e7cda9f6df9ab590a7aec1b51d999
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c f266ad8a2892d659b74f0f50cb6a88b6e7c12179
  F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e
@@@ -422,13 -403,13 +422,13 @@@ F src/update.c 04a06489008ad1d6007e6de3
  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 1d7b97115e7bbac4c318db416d2ca83fc779544a
 -F src/vdbemem.c 19b3036aa4d676e7103b0fb5efd6327da455f915
 +F src/vdbe.c b61897b3e827e600f2a773031326471e49205fa5
 +F src/vdbe.h 67151895e779b35475c6c11b16be2ceb839066c8
 +F src/vdbeInt.h 42fa34502937071aabd3c0596575ba9776547353
- F src/vdbeapi.c 82973abfc02aaba46ec1020423ffcee66665ee45
++F src/vdbeapi.c f5eda36a5c85ef578957ab4311e8d9b1f51a3552
 +F src/vdbeaux.c 4cbd4cc79dad0e2c2b9996ae018d79a7330110f4
 +F src/vdbeblob.c 53ed7f38ab93922038bcfa17aae514dc47752f1e
 +F src/vdbemem.c 28ab8455ac490373798cf2c21def2c1287942551
  F src/vdbesort.c f5009e7a35e3065635d8918b9a31f498a499976b
  F src/vdbetrace.c 8befe829faff6d9e6f6e4dee5a7d3f85cc85f1a0
  F src/vtab.c 2ecfe020c10e0a0c7b078203fdba2fae844744bc
@@@ -1407,7 -1388,7 +1408,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 22ce9218fb2bb56cc5dd4e32077a16f669250d5f 1d018c35b9e81982df036f5e62a4a42219b54e02
- R ba7adfa610b6d372707d43b6ef7bdad4
- U dan
- Z 579d0e0aee90abe69ff327b544da1baf
 -P c2fcb03299f2872d7f97a540ea145519f8b2e5cc
 -R 48a05a5fcfc27e989d0482f8603455ad
++P b7469c44be77358e02892a3abc696f7caa0dcd3b c6ab807b72ddfc1462f61aa91442b6fac04ace8a
++R 1b640a6d419521daa5b2a632ced07132
+ U drh
 -Z 5529d899992d962be9e3269522b69c12
++Z b4a9ac9211cc2ca2704bd7cc4c9b5b17

diff --cc manifest.uuid
index af7caece273008880310da86ebd16696818f4d9a,8b729d01057956f78a2459a7938f39d39643f4c2..5cc71bdd0b551fe2aab8dfc1b90f72ded66b38b5
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- b7469c44be77358e02892a3abc696f7caa0dcd3b
 -c6ab807b72ddfc1462f61aa91442b6fac04ace8a
++c91065f8edb1e54076791716fc20d3fcfe3070dc

diff --cc src/delete.c
Simple merge

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

diff --cc src/vdbeapi.c
Simple merge