Merge all recent enhancements and fixes from trunk.

FossilOrigin-Name: 199bfb67fdf642cca6cd5d460fa4dc602b94837a

diff --cc manifest
index 7b3a3280690274def03aa21a4176c5f2800f73c1,92201cad16b1f3279c75b708cf1ec97d1881d232..fde7b0ea6a93c8aae7425fd56466dc828cadbdaa
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Merge\srecent\strunk\senhancements\sand\sfixes.
- D 2015-06-11T18:01:29.396
 -C Fix\sa\suninitialized\svariable\suse\sin\sthe\scommand-line\sshell\swhen\sthe\n".open"\scommand\sis\sinvoked\swithout\sany\sarguments.
 -D 2015-06-17T17:08:22.680
++C Merge\sall\srecent\senhancements\sand\sfixes\sfrom\strunk.
++D 2015-06-17T18:18:51.003
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in 1063c58075b7400d93326b0eb332b48a54f53025
 +F Makefile.in 5f56f6186fdbd0fb33226e9d2279acde3b3fa88b
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 -F Makefile.msc b7db9ccbbad1c495b98e5326a06cac03aa206127
 +F Makefile.msc 3165ac5ae2fee79cf7d5e025b879f7a52ae66776
  F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION ce0ae95abd7121c534f6917c1c8f2b70d9acd4db
@@@ -220,11 -201,11 +220,11 @@@ F src/complete.c a5cf5b4b56390cfb7b8636
  F src/ctime.c 5a0b735dc95604766f5dac73973658eef782ee8b
  F src/date.c e4d50b3283696836ec1036b695ead9a19e37a5ac
  F src/dbstat.c f402e77e25089c6003d0c60b3233b9b3947d599a
 -F src/delete.c 8857a6f27560718f65d43bdbec86c967ae1f8dfa
 +F src/delete.c b998fbc3c55e8331a5f40aa7ff80972254de8de1
- F src/expr.c 710c764c1974b15a0e56b004ff9f5e6ceab3a854
+ F src/expr.c fbde754df3fa10bbd3a1dcea08e77b0f1684d188
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c c9b63a217d86582c22121699a47f22f524608869
- F src/func.c 5b8b8e77a0fb644eaf8947d413804622e32692b6
+ F src/func.c a98ea5880dc50e9ca6dd6f57079a37b9cfcdecf1
  F src/global.c 4f77cadbc5427d00139ba43d0f3979804cbb700e
  F src/hash.c 4263fbc955f26c2e8cdc0cf214bc42435aa4e4f5
  F src/hash.h c8f3c31722cf3277d03713909761e152a5b81094
@@@ -233,8 -214,8 +233,8 @@@ F src/insert.c a81d4454051c92d058d79cd7
  F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
  F src/legacy.c ba1863ea58c4c840335a84ec276fc2b25e22bc4e
  F src/lempar.c 7274c97d24bb46631e504332ccd3bd1b37841770
- F src/loadext.c 29255bbe1cfb2ce9bbff2526a5ecfddcb49b9271
- F src/main.c 1659e2e8deee8b4ce7c0be8cd37739b13bbfa2bd
+ F src/loadext.c e722f4b832f923744788365df5fb8515c0bc8a47
 -F src/main.c c0061a4f8ba86f957534be93b7026dab324f12c2
++F src/main.c 949e2096a9375cbff11e4835c7b99c813ea2f610
  F src/malloc.c 908c780fdddd472163c2d1b1820ae4081f01ad20
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c abe6ee469b6c5a35c7f22bfeb9c9bac664a1c987
@@@ -270,11 -251,11 +270,11 @@@ F src/random.c ba2679f80ec82c4190062d75
  F src/resolve.c 84c571794e3ee5806274d95158a4c0177c6c4708
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
  F src/select.c 45a814a755f90c1a6345164d2da4a8ef293da53d
- F src/shell.c f26cca96f7dadab5efb5e655edf548f4b91695c5
- F src/sqlite.h.in f61a45445596dc9fe4cdc84a2c042fb310653bef
 -F src/shell.c 69c9ca4dba7a33dc70a1bc46ee3ddd70449e969a
 -F src/sqlite.h.in 76d2f5637eb795b6300d9dd3c3ec3632ffafd721
++F src/shell.c 09565d8e9a2604e503f3d4e39b55ceaaea3446c7
++F src/sqlite.h.in 876ad21b9a6bb5034db7c44cdebd5df2292a5336
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
- F src/sqlite3ext.h 2ebeb634e751a61a6f0eebfa0f4669f46a42f6cd
- F src/sqliteInt.h eb4d0375eb9fdfcc95c58f7b4c3f6f738ba42850
+ F src/sqlite3ext.h be1a718b7d2ce40ceba725ae92c8eb5f18003066
 -F src/sqliteInt.h 95b99b2821811af1f2a1190fa829ffb8e6c04135
++F src/sqliteInt.h 152c1a4cf6858d9724aa79d8cf2e42377ee58194
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c f266ad8a2892d659b74f0f50cb6a88b6e7c12179
  F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e
@@@ -325,20 -306,20 +325,20 @@@ 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 baa0e550dfa76a8d781732a7bfb1f0aa094942f2
+ F src/tokenize.c 57cb3720f53f84d811def2069c2b169b6be539a5
  F src/treeview.c 84aa2d2ed26627ccc8dd3a2becfa18dc86ee4607
  F src/trigger.c 322f23aad694e8f31d384dcfa386d52a48d3c52f
 -F src/update.c 487747b328b7216bb7f6af0695d6937d5c9e605f
 +F src/update.c 24dd6a45b8b3470e62702128ebf11be1f2693145
  F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
  F src/util.c a6431c92803b975b7322724a7b433e538d243539
  F src/vacuum.c 2ddd5cad2a7b9cef7f9e431b8c7771634c6b1701
- F src/vdbe.c c4fc60e18ec234d88f47f59f89f294f2af2436ea
- F src/vdbe.h 01d8c35cb877faca74331bb690f0327493c2cb50
- F src/vdbeInt.h 50e298245b66b320c8930219c8aeab492c9a4cce
 -F src/vdbe.c c9b8985dfc5df9bd512342ea2e56af4be30cb31a
 -F src/vdbe.h 90048aea1910f9df93e6044592bd4a466dc9c5e7
 -F src/vdbeInt.h 20295e482121d13437f69985f77db211cdc8bac1
 -F src/vdbeapi.c 6a0d7757987018ff6b1b81bc5293219cd26bb299
 -F src/vdbeaux.c 4c82d6f686f72ea7d266d26d528a171b728626f7
 -F src/vdbeblob.c 4f2e8e075d238392df98c5e03a64342465b03f90
 -F src/vdbemem.c 15c5ca36201efc5a603e6eb3786e09bec08b9a64
++F src/vdbe.c abef10c8329ae4a29f56e0f2d23e15cf6e8c5677
++F src/vdbe.h 218e957540f5e0866501d2b546ded647c86b8d84
++F src/vdbeInt.h 571977048ae46b947fb8bbbd1332e5d98f1ca845
 +F src/vdbeapi.c a5d2e8afd53b4f81934f5ca59c04465cd1a6d50d
- F src/vdbeaux.c 9b50d9248b54a9961fdd4d5a9ec5c05f93045a7b
++F src/vdbeaux.c 73788765a2d43514822fbcb2a69068fb48f4dcdd
 +F src/vdbeblob.c ab33f9b57cfce7dddb23853090186da614be4846
- F src/vdbemem.c 794bba184f95cc64c7e089f01ca9789624c14a61
++F src/vdbemem.c 05e4f9302fb183c37373908bc33c04c8859015b5
  F src/vdbesort.c f5009e7a35e3065635d8918b9a31f498a499976b
  F src/vdbetrace.c 8befe829faff6d9e6f6e4dee5a7d3f85cc85f1a0
  F src/vtab.c c535e80259ebe616467181a83a4263555b97c694
@@@ -963,10 -943,10 +963,10 @@@ F test/superlock.test 1cde669f68d2dd37d
  F test/sync.test a34cd43e98b7fb84eabbf38f7ed8f7349b3f3d85
  F test/syscall.test d2fdaad713f103ac611fe7ef9b724c7b69f8149c
  F test/sysfault.test fa776e60bf46bdd3ae69f0b73e46ee3977a58ae6
- F test/table.test bd841e8df69b99172ce9c7d53587463913d711ca
+ F test/table.test 33bf0d1fd07f304582695184b8e6feb017303816
  F test/tableapi.test 2674633fa95d80da917571ebdd759a14d9819126
  F test/tableopts.test dba698ba97251017b7c80d738c198d39ab747930
 -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
@@@ -1304,9 -1284,9 +1304,9 @@@ F tool/varint.c 5d94cb5003db9dbbcbcc5df
  F tool/vdbe-compress.tcl 5926c71f9c12d2ab73ef35c29376e756eb68361c
  F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
- F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
+ F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 0c1a901cd60e557fc676b97625243163dfe9be9d afc6db9b105f32110112b877f06091757888a5f2
- R badb2019580fc793add1b23514b50992
 -P c89d772628564a808173f6f73bc1798ec714276b
 -R 2be138dcb45d5c718e3a818150a1ac69
++P c39cb0e2571f58c87053de009e2c135d71b2c3af fc4f4d1eccec2e09b5d2e6c4da082204f4d5a016
++R b0895354eaa33e80f7f008da5f4f3c57
  U drh
- Z f08b8b4c812a9cba111c95cd9b9fc9e3
 -Z 1c763b619a4c5a5f5f6d672aa5693e42
++Z 0081592a2aae788aeca7ea387179f084

diff --cc manifest.uuid
index ea039b1940cfb97105e9e1a494e3101b411bb565,84708615a52d72cbdf66f3e99401a226bda74509..7ae2545cafa1ef3779212d2d87a58fbb9a3e1298
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- c39cb0e2571f58c87053de009e2c135d71b2c3af
 -fc4f4d1eccec2e09b5d2e6c4da082204f4d5a016
++199bfb67fdf642cca6cd5d460fa4dc602b94837a

diff --cc src/main.c
Simple merge

diff --cc src/shell.c
index c6317e99fd348843f5fbdc64cc0b1d350a2778b0,ef3f73d38a6c90bceb8921412ac344e6546eec57..746e7229b63c0ebfc611b7da2cf847be09346a70
--- 1/src/shell.c
--- 2/src/shell.c
+++ b/src/shell.c
@@@ -3438,12 -3354,10 +3443,11 @@@ static int do_meta_command(char *zLine
      const char *zSavedFilename = p->zDbFilename;
      char *zNewFilename = 0;
      p->db = 0;
-     if( nArg>=2 ){
-       p->zDbFilename = zNewFilename = sqlite3_mprintf("%s", azArg[1]);
-     }
+     if( nArg>=2 ) zNewFilename = sqlite3_mprintf("%s", azArg[1]);
+     p->zDbFilename = zNewFilename;
      open_db(p, 1);
      if( p->db!=0 ){
 +      session_close_all(p);
        sqlite3_close(savedDb);
        sqlite3_free(p->zFreeOnClose);
        p->zFreeOnClose = zNewFilename;

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

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc src/vdbe.h
Simple merge

diff --cc src/vdbeInt.h
Simple merge

diff --cc src/vdbeaux.c
Simple merge

diff --cc src/vdbemem.c
Simple merge