Merge in all recent trunk enhancements.

FossilOrigin-Name: 406f79183736b6ad360169b837172afef2c82a4312f5787db08c54167a44b15e

diff --cc Makefile.msc
Simple merge

diff --cc main.mk
Simple merge

diff --cc manifest
index 6a47f6372ce851547f8d4a1f406d5b5374b687f9,3552e5e8cef864e22bd20f8cd7e6292e1f9b6377..eb4d9552dd96a960b564ec4ab1f3caab0484f7e6
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,10 -1,8 +1,10 @@@
- C Have\szipfile\ssupport\sDELETE\scommands.
- D 2017-12-30T18:32:27.545
 -C Remove\sthe\ssnarky\s"_supported_"\squalifier\sfrom\sthe\sname\sof\sthe\nsqlite_offset()\sSQL\sfunction.
 -D 2018-01-04T19:20:37.203
++C Merge\sin\sall\srecent\strunk\senhancements.
++D 2018-01-04T19:54:55.108
 +F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 +F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
- F Makefile.in ceb40bfcb30ebba8e1202b34c56ff7e13e112f9809e2381d99be32c2726058f5
+ F Makefile.in 1b11037c5ed3399a79433cc82c59b5e36a7b3a3e4e195bb27640d0d2145e03e1
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
- F Makefile.msc 5a740138ce23a88c33a02a65ffea45d129edf458afdc7547a2bdfd54f1ad6801
 -F Makefile.msc f68b4f9b83cfeb057b6265e0288ad653f319e2ceacca731e0f22e19617829a89
++F Makefile.msc 8723bebdec08013054d1ade8f65a13cad34bf8dd015f09649754be2b5f6edc59
  F README.md eeae1e552f93ef72ef7c5b8f6647b368a001c28820ad1df179d3dae602bef681
  F VERSION 0c10cdfed866fdd2d80434f64f042c3330f1daaed12e54287beb104f04b3faaf
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -405,7 -401,7 +405,7 @@@ F ext/userauth/userauth.c 3410be31283ab
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk 9109d5786263a20fcf321a77c463d39c9ac84c871ea3774b0d213d8311dda105
 -F main.mk 59744c818d349d170ff56cdbdfb5af0e0a2029db18ce2824fcd1b0a3fa317d84
++F main.mk 739f832da37d29e252dd9f609c3864f3ecfa42136132eab9b11acb5162b7d02d
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
  F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
  F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
@@@ -483,11 -479,11 +483,11 @@@ F src/random.c 80f5d666f23feb3e6665a6ce
  F src/resolve.c bbee7e31d369a18a2f4836644769882e9c5d40ef4a3af911db06410b65cb3730
  F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
  F src/select.c 8b22abe193e4d8243befa2038e4ae2405802fed1c446e5e502d11f652e09ba74
- F src/shell.c.in 9177b6cc706b1dd1ed81b05344641597d7ed8bba97a8fc31192309189846fab7
- F src/sqlite.h.in 2126192945019d4cdce335cb236b440a05ec75c93e4cd94c9c6d6e7fcc654cc4
 -F src/shell.c.in a418ddceef7a2789f18bdc2bcdd481b2562fe4a7754b8009c8dd33d5a67da332
++F src/shell.c.in 3e2db269982c4a6f7e8e32ef5620eda718a21a71bb2b5cd73c3ea9b87c6d21bc
+ F src/sqlite.h.in 1f1a2da222ec57465794e8984d77f32d0bd0da80cdc136beadda461a0be9d80c
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h c02d628cca67f3889c689d82d25c3eb45e2c155db08e4c6089b5840d64687d34
- F src/sqliteInt.h 003b78433baae4e5c997f99f2f9cf98d90754f256baeacb32f8189569a48251f
+ F src/sqliteInt.h fd8702c65994d7de3e2d8f7d85d958731da1ed29476571fdfa2290fd8ec0bf80
  F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b
  F src/status.c 9737ed017279a9e0c5da748701c3c7bf1e8ae0dae459aad20dd64fcff97a7e35
  F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
@@@ -1693,7 -1688,7 +1694,7 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P f69e8194bfa7de436c96028730ebd57f186d2e6207792e172e1aa38c7f4211c9
- R 145246df93a24ee9820cce32c6b5afb4
- U dan
- Z 640cac8c8ac89e53412f930b0b057c7a
 -P d91e3f3d343d281af374dd23eea333e61228539023ad5c5aea622085e5863bc7
 -R 314fe8cfc8ec7f02f3acb6e4d50707fb
++P 01d4e866fb7b01aeada537d41c4a47747c7810e2028f51077ee5b8b78c348954 a6eee0fcd89d3958f8720ebdb5f0a8558b4795d747128091dae283eb81c4f74f
++R d4f5940088399233b1f4f56f19294263
+ U drh
 -Z 7ea7a34ef1d7c0cfd34c8e9e5f226383
++Z c1193b259bc575590a62665cc9281689

diff --cc manifest.uuid
index bc6078e242c9e31568466b34bcb48da33d6381a0,561f8b3f927d4d3fe2afe43ead64181556517aac..0fefe4597b46b990dd89dfe0a656db44b4a60177
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 01d4e866fb7b01aeada537d41c4a47747c7810e2028f51077ee5b8b78c348954
 -a6eee0fcd89d3958f8720ebdb5f0a8558b4795d747128091dae283eb81c4f74f
++406f79183736b6ad360169b837172afef2c82a4312f5787db08c54167a44b15e

diff --cc src/shell.c.in
index f7edb53f06b569a9544a18786c890c395ec0a5f5,4c9e60769ae7f066807ddd716ec0e20b608d3a5e..6f1c92e0069f4794760ba08f45093e71d4558f1b
--- 1/src/shell.c.in
--- 2/src/shell.c.in
+++ b/src/shell.c.in
@@@ -3002,12 -3079,10 +3083,14 @@@ static void open_db(ShellState *p, int 
      sqlite3_fileio_init(p->db, 0, 0);
      sqlite3_shathree_init(p->db, 0, 0);
      sqlite3_completion_init(p->db, 0, 0);
-     sqlite3_create_function(p->db, "shell_add_schema", 2, SQLITE_UTF8, 0,
 +#ifdef SQLITE_HAVE_ZLIB
 +    sqlite3_zipfile_init(p->db, 0, 0);
 +    sqlite3_sqlar_init(p->db, 0, 0);
 +#endif
+     sqlite3_create_function(p->db, "shell_add_schema", 3, SQLITE_UTF8, 0,
                              shellAddSchemaName, 0, 0);
+     sqlite3_create_function(p->db, "shell_module_schema", 1, SQLITE_UTF8, 0,
+                             shellModuleSchema, 0, 0);
    }
  }