Merge all trunk enhancements and fixes into the sessions branch.

FossilOrigin-Name: de7083cfe2bb00b689bec6bcc75e994f564ceda6

diff --cc Makefile.in
Simple merge

diff --cc Makefile.msc
Simple merge

diff --cc main.mk
Simple merge

diff --cc manifest
index cc09519aa25fc165849b20cb897157538c4d5fee,1788e32f45b119668ec1b003bfae1d88ab92a0a5..9d80d5aa8389fa83cd63300070833524856bcfa5
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Modify\sthe\ssqlite3session_diff()\sAPI\sso\sthat\stables\swith\sno\sPRIMARY\sKEYs\sare\signored.\sThis\smatches\sthe\sother\ssessions\sAPIs.\sAlso\schange\ssqlite3session_diff()\sso\sthat\sit\sreturns\sSQLITE_SCHEMA,\sinstead\sof\sSQLITE_ERROR,\sif\sthe\stables\sbeing\scompared\sdo\snot\shave\scompatible\sschemas.
- D 2015-04-23T17:22:50.000
 -C Fix\sa\sminor\scoding\sinefficiency\sfound\sduring\spre-release\sinspection.
 -D 2015-05-05T16:57:52.547
++C Merge\sall\strunk\senhancements\sand\sfixes\sinto\sthe\ssessions\sbranch.
++D 2015-05-05T17:12:27.092
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in 7599f0c96df628cd543884b1b2f2a2fbffd00079
 -F Makefile.in 08728ecbeddca339c77bfd564d3484b523dffdb1
++F Makefile.in 114f5809eeff63855cfda99551addf1e00ef7730
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc d775d530a1a2572c049aaceca22d5db3f1c37b64
 -F Makefile.msc c6241f7fa2912427410ef15429c8ab5601e19a71
++F Makefile.msc 6b0b04b6037ef272e8c1f2a24ccc0f99663dde14
  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 11a73bab5613d7a1554ac3376b7c99a3d9190037
 -F main.mk f012feb95fc4acfb583f89b6f9d1dc6253a8f08d
++F main.mk d8b3e198082720785408b7d99c2f45f749d1da7b
  F mkopcodec.awk c2ff431854d702cdd2d779c9c0d1f58fa16fa4ea
  F mkopcodeh.awk d5e22023b5238985bb54a72d33e0ac71fe4f8a32
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
@@@ -199,11 -181,12 +199,12 @@@ F src/callback.c 7b44ce59674338ad48b0e8
  F src/complete.c a5cf5b4b56390cfb7b8636e8f7ddef90258dd575
  F src/ctime.c 98f89724adc891a1a4c655bee04e33e716e05887
  F src/date.c e4d50b3283696836ec1036b695ead9a19e37a5ac
 -F src/dbstat.c 1eacd310212b5ae59b7be645a06de8f8bbe0b5d6
 -F src/delete.c 37964e6c1d73ff49cbea9ff690c9605fb15f600e
++F src/dbstat.c 1eacd310212b5ae59b7be645a06de8f8bbe0b5d6 w src/test_stat.c
 +F src/delete.c 5075d88557eb4e2a7fdb2b61a96142830d8589b8
- F src/expr.c 4c05a28eebe63b288fda1db0e8de556a82ca2ec6
+ F src/expr.c 3fb2ab3ab69d15b4b75ae53fceb4e317f64cb306
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c c9b63a217d86582c22121699a47f22f524608869
- F src/func.c 1414c24c873c48796ad45942257a179a423ba42f
+ F src/func.c 5b8b8e77a0fb644eaf8947d413804622e32692b6
  F src/global.c 4f77cadbc5427d00139ba43d0f3979804cbb700e
  F src/hash.c 4263fbc955f26c2e8cdc0cf214bc42435aa4e4f5
  F src/hash.h c8f3c31722cf3277d03713909761e152a5b81094
@@@ -212,8 -195,8 +213,8 @@@ F src/insert.c 533e0f08a2e695cbd67c6a3d
  F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
  F src/legacy.c ba1863ea58c4c840335a84ec276fc2b25e22bc4e
  F src/lempar.c 7274c97d24bb46631e504332ccd3bd1b37841770
- F src/loadext.c 86bd4e2fccd520b748cba52492ab60c4a770f660
- F src/main.c 4eecdeb7b3f6be5aa336252f71208344b5edd196
+ F src/loadext.c 29255bbe1cfb2ce9bbff2526a5ecfddcb49b9271
 -F src/main.c 331fda6b255ae6a08e6ade89f0ac1d158691f3c6
++F src/main.c 6b9b7976bd63b04b795f0eff6e07dcb019f56e97
  F src/malloc.c 6a370b83d54e4bbf6f94021221c2a311cff26a18
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c abe6ee469b6c5a35c7f22bfeb9c9bac664a1c987
@@@ -248,16 -231,16 +249,16 @@@ F src/printf.c 1f87c24770b2cea3fadbec03
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
  F src/resolve.c 13109bc3b5ab404446296efa17039640de5bc35d
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
- F src/select.c 35433ea8894ac42594ddc31eb0165a6d6401cfe5
- F src/shell.c a412c46fdd2ccc19757eada50d434241cb6e2e6f
+ F src/select.c 1b0bfc7d59e48c26b895a6b719157111a617d9e3
 -F src/shell.c 1b6fc902d4455b7a4d6d9cc9a23d3f6af7089302
 -F src/sqlite.h.in ca27603a36fcacdaac5a19d8ee35aaff8ce8516f
++F src/shell.c a781037a81ac801495e06855605b444a8c5bd19b
 +F src/sqlite.h.in 679a3abfef9c13a989728fd27f308a3e3f00e232
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
  F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d
- F src/sqliteInt.h 205ef3fbb28a6c82d295baa17e2c41f523fa9201
 -F src/sqliteInt.h 20d9c59fd82774503b8953acfbcc6ecbdd9ee6aa
++F src/sqliteInt.h 15960c3f5f682abb9ac1664c6bd9146d18d3f21d
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c f266ad8a2892d659b74f0f50cb6a88b6e7c12179
- F src/table.c e7a09215315a978057fb42c640f890160dbcc45e
- F src/tclsqlite.c 9039c3559c0126d04aceb39dca63f02e4b9143ac
+ F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e
 -F src/tclsqlite.c d4fa052d3fbb655150d4ca8eedc70384b98bfef3
++F src/tclsqlite.c d6952e9d739357ffe9bbfbda3832f6315f6271a2
  F src/test1.c 90fbedce75330d48d99eadb7d5f4223e86969585
  F src/test2.c 577961fe48961b2f2e5c8b56ee50c3f459d3359d
  F src/test3.c 64d2afdd68feac1bb5e2ffb8226c8c639f798622
@@@ -270,9 -253,9 +271,9 @@@ F src/test9.c bea1e8cf52aa93695487baded
  F src/test_async.c 21e11293a2f72080eda70e1124e9102044531cd8
  F src/test_autoext.c dea8a01a7153b9adc97bd26161e4226329546e12
  F src/test_backup.c 2e6e6a081870150f20c526a2e9d0d29cda47d803
- F src/test_blob.c 1f2e3e25255b731c4fcf15ee7990d06347cb6c09
+ F src/test_blob.c e5a7a81d61a780da79101aeb1e60d300af169e07
  F src/test_btree.c 2e9978eca99a9a4bfa8cae949efb00886860a64f
 -F src/test_config.c c2d3ff6c129d50183900c7eff14158ff7e9b3f03
 +F src/test_config.c 5140cf3a0b766d177dfb9f8f2a3b00224ec3f5c8
  F src/test_demovfs.c 0de72c2c89551629f58486fde5734b7d90758852
  F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc
  F src/test_fs.c ced436e3d4b8e4681328409b8081051ce614e28f
@@@ -305,27 -287,27 +305,27 @@@ F src/test_vfs.c 3b65d42e18b262805716bd
  F src/test_vfstrace.c bab9594adc976cbe696ff3970728830b4c5ed698
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
  F src/threads.c 6bbcc9fe50c917864d48287b4792d46d6e873481
- F src/tokenize.c b7fb584c2be5ec39b6fdf04b185e7c6f33f8dc15
+ F src/tokenize.c b15511a2396641792f386ceb440d1d922972a78e
  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 e8f00a2ef92c484ce31cdf3f112b7e83cf4e1a6a
 -F src/vdbe.c ff9efff0548b6a31d095ddc999d606e7605f0cdc
 -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 7bfbeef0978a2e1a05d979641fdbf7c189b7ddf4
++F src/vdbe.c 9d202ac3b0c99c355ba0b0a6972320687809ebb0
 +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 6a4802a9d59195c98fdeb6e226f91f637b3121f8
- F src/vdbesort.c 2e7f683464fd5db3be4beaa1ff2d39e24fcb64b8
- F src/vdbetrace.c f95c2dff9041fcf07f871789c22ebb0648ea0b7c
- F src/vtab.c 5f81f8a59c1f5ddb94c918f25ed5d83578fcc633
++F src/vdbemem.c eda55a13cfaa797f89ef243a129f3f5a457719e7
+ F src/vdbesort.c f5009e7a35e3065635d8918b9a31f498a499976b
+ F src/vdbetrace.c 8befe829faff6d9e6f6e4dee5a7d3f85cc85f1a0
+ F src/vtab.c c535e80259ebe616467181a83a4263555b97c694
  F src/vxworks.h c18586c8edc1bddbc15c004fa16aeb1e1342b4fb
- F src/wal.c 753995db83247f20361a8e8a874990b21a75abd9
+ F src/wal.c ce2cb2d06faab54d1bce3e739bec79e063dd9113
  F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
  F src/walker.c c253b95b4ee44b21c406e2a1052636c31ea27804
- F src/where.c 32fe265e3dc74ef3b27deb9e6eb5fc3c71409612
+ F src/where.c 85fff9c40569ccb79c3177419b339e7d7df566cb
  F src/whereInt.h cbe4aa57326998d89e7698ca65bb7c28541d483c
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
@@@ -935,7 -920,7 +939,7 @@@ F test/tclsqlite.test 7179b4e0bf236ddf0
  F test/tempdb.test 19d0f66e2e3eeffd68661a11c83ba5e6ace9128c
  F test/temptable.test d2c9b87a54147161bcd1822e30c1d1cd891e5b30
  F test/temptrigger.test 8ec228b0db5d7ebc4ee9b458fc28cb9e7873f5e1
- F test/tester.tcl 655afed0715958ec50fd575549e6c4e57311ff18
 -F test/tester.tcl 51211254f2ee2340d3e4fa0a83bd5381b9e1a227
++F test/tester.tcl 1769622cf6e9750530c4f08897f843a48a22b10f
  F test/thread001.test 9f22fd3525a307ff42a326b6bc7b0465be1745a5
  F test/thread002.test e630504f8a06c00bf8bbe68528774dd96aeb2e58
  F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7
@@@ -1236,8 -1221,8 +1240,8 @@@ 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 ebbf1198e19d84b4c34cca077d8f727a06ff8a11
 -F tool/mksqlite3c.tcl 10c06c9c616415c0269c13a33304a75e3c319c3f
 -F tool/mksqlite3h.tcl 44730d586c9031638cdd2eb443b801c0d2dbd9f8
++F tool/mksqlite3c.tcl afdd92627c1fb31088ba798761f4701f675a4bf5
 +F tool/mksqlite3h.tcl 96d92fcac21c6037d9db20c7cb2e06b534b550ac
  F tool/mksqlite3internalh.tcl eb994013e833359137eb53a55acdad0b5ae1049b
  F tool/mkvsix.tcl 3b58b9398f91c7dbf18d49eb87cefeee9efdbce1
  F tool/offsets.c fe4262fdfa378e8f5499a42136d17bf3b98f6091
@@@ -1260,10 -1245,10 +1264,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 393b0f5b17ef29341664563a90d40ee63a0a18f7
+ F tool/sqldiff.c 10e3c01111f97b99627adf0954cf5ffbfba0723c
  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
@@@ -1271,7 -1256,7 +1275,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 4d34a3d40da210bebb2a2e6dff094f9a39c92798
- R 77fdc1b8d856af82047ddfafb467bba9
- U dan
- Z c001be8d13359c151923937b5aa6a277
 -P b8f090e65d010c62df335d0520a36a24904e8bc6
 -R aa3e34d67b680aaa71313e3178def66e
++P aada0ad08e3baa10d14d1f3393183110289e068e cc50883d67334507227e1384fef6cc7c93fd7de1
++R 57a34e2e8eeec13ac380555b67cfa4b9
+ U drh
 -Z cdb699fe6147a4b364800efebeb8babc
++Z 93aac8a32e2cf8ebfa942b5cc002f02e

diff --cc manifest.uuid
index ef8da808c57ff498a61f8eeff42d720c305f04ea,676e81612ff3f7b3e893bd77076b95772ed92e7f..0ec95b518f1e6d074333b6e792b094d7db2e791b
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- aada0ad08e3baa10d14d1f3393183110289e068e
 -cc50883d67334507227e1384fef6cc7c93fd7de1
++de7083cfe2bb00b689bec6bcc75e994f564ceda6

diff --cc src/main.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/vdbe.c
Simple merge

diff --cc src/vdbemem.c
Simple merge

diff --cc test/tester.tcl
Simple merge

diff --cc tool/mksqlite3c.tcl
index 4fe552350c81617534fb819b4636b91d2c3ae27f,0c2f3e7aaeb907a38aa73577fa8add610413da42..14191bdb62f59382d5366e9f7aa274f0f0bd11b8
--- 1/tool/mksqlite3c.tcl
--- 2/tool/mksqlite3c.tcl
+++ b/tool/mksqlite3c.tcl
@@@ -368,8 -368,7 +370,8 @@@ foreach file 
     rtree.c
     icu.c
     fts3_icu.c
- 
+    dbstat.c
 +   sqlite3session.c
  } {
    copy_file tsrc/$file
  }