Merge all recent trunk enhancements into the sessions branch.

FossilOrigin-Name: 1d1c57c3566d86cd44f146688b620131b3b57e52

diff --cc Makefile.in
Simple merge

diff --cc manifest
index 476951ee73b74a6fb13bf97db316192fc4fde9c3,47a6aa6b9918c073fe15369cd36c134ee3545229..87f9fa311dfc27d750c90e740c2067996d58a1ac
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Merge\srecent\strunk\senhancements\sinto\sthe\ssessions\sbranch.
- D 2015-03-09T13:07:45.320
 -C Also\smerge\sthe\sWAL\sblocking\slock\stests\sthat\swere\ssomehow\smissed\son\sthe\nprevious\scheck-in.
 -D 2015-03-17T17:08:35.872
++C Merge\sall\srecent\strunk\senhancements\sinto\sthe\ssessions\sbranch.
++D 2015-03-17T18:54:10.608
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in 5c5f6000dd1e4d8d8a402e4e749499720318fbd9
 -F Makefile.in 88a3e6261286db378fdffa1124cad11b3c05f5bb
++F Makefile.in 1bf4de5d0809e0ed046d6f2671ea46d1d6c69608
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 -F Makefile.msc 529e61cd9d29a3934758b4b3a0bb649b6c653481
 +F Makefile.msc 0de5ab64775feb698a51950874e56cf15fb8f67f
  F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
  F README.md d58e3bebc0a4145e0f2a87994015fdb575a8e866
  F VERSION 319eb1ced4b4d17a67730f2b7b85f15c1346cb60
@@@ -248,15 -231,15 +248,15 @@@ F src/random.c ba2679f80ec82c4190062d75
  F src/resolve.c f4d79e31ffa5820c2e3d1740baa5e9b190425f2b
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
  F src/select.c 94e016b6733b1d39a2f4c8d431155b4c2897d907
 -F src/shell.c cce82ca26392578a4a1ee927dfe55ea3411c7c92
 -F src/sqlite.h.in ce547ac4df17e8d996679f7a385911b3a0c52d48
 +F src/shell.c b90258c9083d94f51434ab57ab12336550a1483f
- F src/sqlite.h.in b0e4bb95b2728d7663a9d8f64ba3d3865ac646e1
++F src/sqlite.h.in dff62c6db32b6b627184edae85878d66b184bd62
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
  F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d
 -F src/sqliteInt.h fae682c2b4dfbe489b134d74521c41c088f16ab1
 +F src/sqliteInt.h 9c62b8dff75ed3a8fc3bb5883a91e66ece8666da
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c 81712116e826b0089bb221b018929536b2b5406f
  F src/table.c e7a09215315a978057fb42c640f890160dbcc45e
- F src/tclsqlite.c 82984e46304db7fdf4163180b106b5bdf81b5d0e
 -F src/tclsqlite.c fa72a7c5278662357c105ba7925c1d0972506ff9
++F src/tclsqlite.c 7ed2644b48685cba250eb71c7c298fedab6e221a
  F src/test1.c 90fbedce75330d48d99eadb7d5f4223e86969585
  F src/test2.c 577961fe48961b2f2e5c8b56ee50c3f459d3359d
  F src/test3.c 64d2afdd68feac1bb5e2ffb8226c8c639f798622
@@@ -310,13 -293,13 +310,13 @@@ F src/update.c d207deb7a031f698104bee87
  F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
  F src/util.c 98a7627ca48ad3265b6940915a1d08355eb3fc7e
  F src/vacuum.c 9460b9de7b2d4e34b0d374894aa6c8a0632be8ec
- F src/vdbe.c e70e58bfce88e0075c1b17a2f37c57389b7bc0ba
 -F src/vdbe.c a2725107658fd9572637e8e09d46dcfe851edb96
 -F src/vdbe.h 6fc69d9c5e146302c56e163cb4b31d1ee64a18c3
 -F src/vdbeInt.h bb56fd199d8af1a2c1b9639ee2f70724b4338e3a
 -F src/vdbeapi.c 583d56b129dd27f12bed518270de9ebe521e6a75
 -F src/vdbeaux.c 23390670e64f011f3fed8f38a2f25aaccacb74d2
 -F src/vdbeblob.c 4f2e8e075d238392df98c5e03a64342465b03f90
 -F src/vdbemem.c c0dc81285b7571b0a31c40f17846fe2397ec1cd9
++F src/vdbe.c 20dc93eae5fe11a33a7edf6d863c634e4e2eb15e
 +F src/vdbe.h b434bb75fbec973d18d49225a59833ae39ee2afc
 +F src/vdbeInt.h 50fc184e25bfe1b39b8e508082cd3f0cd8a29b3d
- F src/vdbeapi.c be4717b0a037fd834d195ef152682513533cddb5
- F src/vdbeaux.c fbc0e6dfcf472e76001f7684b3b534710a645138
++F src/vdbeapi.c d95f2bb43d01a91d93231cde181811b38182202e
++F src/vdbeaux.c bf85a5975ade7da58fb31473a713c2f63ac86697
 +F src/vdbeblob.c ab33f9b57cfce7dddb23853090186da614be4846
- F src/vdbemem.c 96e41193b4affd9ebc0eea2fa628879dac88c744
++F src/vdbemem.c 149e585645c3f3ef063f2b7251646388cfe3d47d
  F src/vdbesort.c 6d64c5448b64851b99931ede980addc3af70d5e2
  F src/vdbetrace.c 7e4222955e07dd707a2f360c0eb73452be1cb010
  F src/vtab.c 699f2b8d509cfe379c33dde33827875d5b030e01
@@@ -924,7 -909,7 +927,7 @@@ F test/sysfault.test fa776e60bf46bdd3ae
  F test/table.test 06271d61eb13871490d38168433c1ef3dd82bb2a
  F test/tableapi.test 2674633fa95d80da917571ebdd759a14d9819126
  F test/tableopts.test dba698ba97251017b7c80d738c198d39ab747930
- F test/tclsqlite.test a7308276aad2e6c0bfb5b0414424dd0d9cc0cad7
 -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
@@@ -1259,7 -1246,8 +1264,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 131a2d3116436ca6304777c9c5d46b7c4051d949 984c3fd5261619fb542a5a95dab37707b5d79dbf
- R cb093bb12447629434661af3de009e52
 -P ec2f46de531ec8ef91981b19b48ab64db7727264 e22dde187eb0b389d6d93e2e39a26fd0f4e6196e
 -R 35d1aacb5b2efba4948b8dccdeab808c
 -T +closed e22dde187eb0b389d6d93e2e39a26fd0f4e6196e
++P 68c8937e83b770d5ec6b1855c1bde81057c11b5f 7214dab7443d35c105904dd69635c1f8b45b2fc8
++R 2d91509a074fbfae08a7fbe6a418b4b7
  U drh
- Z afb94d5a3aa820ac14e063085ce8c969
 -Z 7357efe8421db7654a103c304e504696
++Z 602e4d87f819b64c7ba9f529ae0477ce

diff --cc manifest.uuid
index 638ddfa55bb71332cfe550faf41f94ec360d9a0b,f8ce2770f13fb815f98b88adda82f24ddd032bd6..2f02014ac0553caa8b0db532ab8fe79c56234d1c
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 68c8937e83b770d5ec6b1855c1bde81057c11b5f
 -7214dab7443d35c105904dd69635c1f8b45b2fc8
++1d1c57c3566d86cd44f146688b620131b3b57e52

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

diff --cc src/tclsqlite.c
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc src/vdbeapi.c
Simple merge

diff --cc src/vdbeaux.c
Simple merge

diff --cc src/vdbemem.c
Simple merge

diff --cc test/tclsqlite.test
Simple merge