Merge latest trunk changes into this branch.

FossilOrigin-Name: 97a9604d85cf5044e8109e533d4682b25bfe6a110f403ebd0fdef03880059f37

diff --cc Makefile.in
Simple merge

diff --cc manifest
index 5b13c039dfd5398370618439f5e2b5f93a3c8164,d2655343e5f87e7d0c81c0b4e747dcb5cc3aa8be..88295cb2f8a3bc1fa6b18346be2e5797f7607fa2
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,10 -1,10 +1,10 @@@
- C Update\sdoc/shared_schema.md\sto\sdescribe\sthe\sshell\stool\s".shared-schema"\sdot-command.
- D 2019-02-26T16:36:21.259
 -C Fix\sa\sproblem\spreventing\scompilation\swith\sSQLITE_OMIT_UTF16.
 -D 2019-03-04T07:15:57.844
++C Merge\slatest\strunk\schanges\sinto\sthis\sbranch.
++D 2019-03-04T07:25:38.382
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
- F Makefile.in 56456706c4da271309914c756c9c8ea537685f1c79f8785afa72f968d6810482
 -F Makefile.in 1ad7263f38329c0ecea543c80f30af839ee714ea77fc391bf1a3fbb919a5b6b5
++F Makefile.in 95ac54f7a7f164c51ef22c7ef28e06d396402d0cbb200dd0bdf08829116bda14
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 -F Makefile.msc 5df60c70edb157feb2148a14c687551969599bd065875a0b959b6b139721ca72
 +F Makefile.msc bdc4f060e04769b7729b309becc0c3c5623c0f9d98b4d06da9b9ab029f2bad99
  F README.md 377233394b905d3b2e2b33741289e093bc93f2e7adbe00923b2c5958c9a9edee
  F VERSION 288d756b1b7be03ecdbf1795c23af2c8425f2e46ba6979a14ef53360308f080d
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -457,11 -456,11 +457,11 @@@ F src/auth.c 0fac71038875693a937e506bce
  F src/backup.c 78d3cecfbe28230a3a9a1793e2ead609f469be43e8f486ca996006be551857ab
  F src/bitvec.c 17ea48eff8ba979f1f5b04cc484c7bb2be632f33
  F src/btmutex.c 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6
- F src/btree.c 026f48c39b179a5602423904fcaaae87bbd75f659fd672b3756fea43356d9909
+ F src/btree.c 59695c6e5eb527bfefc2b3d8ffebd178ad8686eaeb810c9f57719d6d2b72822e
  F src/btree.h 63b94fb38ce571c15eb6a3661815561b501d23d5948b2d1e951fbd7a2d04e8d3
  F src/btreeInt.h 6111c15868b90669f79081039d19e7ea8674013f907710baa3c814dc3f8bfd3f
 -F src/build.c 3acec29b23948042173301a8befebae01a98344debf66cbd4467c8b9077707b8
 -F src/callback.c 25dda5e1c2334a367b94a64077b1d06b2553369f616261ca6783c48bcb6bda73
 +F src/build.c f556ca5fe2c6a2a8c78bc7303a772f1d86979738cbdec112fbddca3f5505143a
 +F src/callback.c 0d68a032872495351f70d533610a94388a4f191cce37ec7663d6598eaa8a4a21
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
  F src/ctime.c 109e58d00f62e8e71ee1eb5944ac18b90171c928ab2e082e058056e1137cc20b
  F src/date.c ebe1dc7c8a347117bb02570f1a931c62dd78f4a2b1b516f4837d45b7d6426957
@@@ -470,8 -469,8 +470,8 @@@ F src/dbstat.c c12833de69cb655751487d2c
  F src/delete.c d08c9e01a2664afd12edcfa3a9c6578517e8ff8735f35509582693adbe0edeaf
  F src/expr.c f2d0ecf68213770be4fad83128ce02e67667deebaa0a44061313f7e4f2a4ae28
  F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 -F src/fkey.c bd0138acdc008c1845ccf92f8e73787880562de649471804801c06fed814c765
 +F src/fkey.c 878bec1b4d9aab3b34585121b834fce9b2780352b7282510e4ffc94b75ce6c83
- F src/func.c 0341881d22903aac5ba7f352b188806d6436e1d6ae4235ff01e44d56879dfe63
+ F src/func.c 2ccf4ae12430b1ae7096be5f0675887e1bd0732828af0ac0f7496339b7c6edee
  F src/global.c 0dea3065ea72a65ae941559b6686aad6516d4913e76fa4f79a95ff7787f624ec
  F src/hash.c a12580e143f10301ed5166ea4964ae2853d3905a511d4e0c44497245c7ce1f7a
  F src/hash.h ab34c5c54a9e9de2e790b24349ba5aab3dbb4fd4
@@@ -516,16 -515,16 +516,16 @@@ F src/printf.c 93a3d539019264683a444bc0
  F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
  F src/resolve.c 09419ad5c432190b69be7c0c326e03abb548a97c2c50675b81b459e1b382d1d2
  F src/rowset.c d977b011993aaea002cab3e0bb2ce50cf346000dff94e944d547b989f4b1fe93
- F src/select.c c998f694759e37799929e28df8a2649747f8774d4fc233529ab6bda689388e15
- F src/shell.c.in 89848d1ebdf1bb2078c18c173fb05d61a8ee0b35b5f4f26b21d02c9c9e4fe870
- F src/sqlite.h.in a25272dca43fdb730faacade32ec4650d9f5c86839551853c560e01a8861c590
+ F src/select.c 9263f5c30dd44c7ac2eb29f40a7ec64322a96885b71c00de6bc30b756c2e1c49
 -F src/shell.c.in 249c0bf34f7ce272cb17162c297c45ab674a52a5d85193a86191f131196de47f
 -F src/sqlite.h.in f19f7b7646ccd331511b123e2e23d4dc3f3d02f74e1c04d2bb560ea50a323e4c
++F src/shell.c.in 0ba394168b2ade14df18a7b0effbc274bc2d95ae602d60ec133645f564bb06c8
++F src/sqlite.h.in 232002b316f326120cfbd5401a7e2ac54fe80d2f23412990d34649ac12779ab0
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h 960f1b86c3610fa23cb6a267572a97dcf286e77aa0dd3b9b23292ffaa1ea8683
 -F src/sqliteInt.h f253c4ec15e577a293a462e5049f8ea1d0c7a31819b3a88acdd24698df8f4d0b
 +F src/sqliteInt.h f285e974103537be2c79e3ebf6535d21b477ecd05f131397cee78fcf42280d9e
  F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b
 -F src/status.c 46e7aec11f79dad50965a5ca5fa9de009f7d6bde08be2156f1538a0a296d4d0e
 +F src/status.c 28fcf86faee5cc030ca2d5d6b356fc59999cffb478457fe343ae0f9c39b41f6b
  F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
- F src/tclsqlite.c f11d822fb2bd6e155d41535a629d1c34daf3d98a37b1f0ea6b4cb11d150d3c57
 -F src/tclsqlite.c cfe7f93daf9d8787f65e099efb67d7cdfc2c35236dec5d3f6758520bd3519424
++F src/tclsqlite.c 9514e43ebd89325e150fad84b164e2b9ba221050b392ab444f4e7f9e8af46082
  F src/test1.c 353b066e7ec761c4c715c1c20b888e0e7a0b0c0eda7f68c110e032d63713cade
  F src/test2.c 3efb99ab7f1fc8d154933e02ae1378bac9637da5
  F src/test3.c 61798bb0d38b915067a8c8e03f5a534b431181f802659a6616f9b4ff7d872644
@@@ -580,20 -578,20 +580,20 @@@ F src/test_windirent.h 90dfbe95442c9762
  F src/test_window.c cdae419fdcea5bad6dcd9368c685abdad6deb59e9fc8b84b153de513d394ba3f
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
  F src/threads.c 4ae07fa022a3dc7c5beb373cf744a85d3c5c6c3c
- F src/tokenize.c e61ead283dff63762a9f5be462dbd258dba948e5fb4e3b261fc03703426eb12e
+ F src/tokenize.c d3615f0cbe4db5949503bf5916f3cd4fa5de855d5b4ef560f3b6dd5629423a1e
  F src/treeview.c c6ff90da4cc1813ff2d9bb11f17d4d927db62c47e552faa1835edc47269d753d
 -F src/trigger.c bb034c08eca111e66a19cda045903a12547c1be2294b5570d794b869d9c44a73
 +F src/trigger.c 3d8c617337af6b6fced85deb6789fe170ba980785d3de381a01c95a7c94d5200
  F src/update.c 0b973357d88092140531e07ff641139c26fb4380b0b9f5ed98c5f7691b4604d1
  F src/upsert.c 0dd81b40206841814d46942a7337786932475f085716042d0cb2fc7791bf8ca4
  F src/utf.c 810fbfebe12359f10bc2a011520a6e10879ab2a163bcb26c74768eab82ea62a5
  F src/util.c 82a2e3f691a3b654be872e305dab1f455e565dedf5e6a90c818c1ab307c00432
 -F src/vacuum.c a9f389f41556c0ec310bc9169dc9476603c30a0a913ad92bfbc75c86886967ca
 -F src/vdbe.c f1e7b5320df80ff58c67176e35cb48062cbda2a9c9811f11db5faa48071d3fe4
 -F src/vdbe.h 712bca562eaed1c25506b9faf9680bdc75fc42e2f4a1cd518d883fa79c7a4237
 +F src/vacuum.c 7dbed4a756f014f3ce54e6ae3c403ee725e8179cf73fc6dd5c064e5627649f9f
 +F src/vdbe.c e172d15879087eedd047c8ed54f9d69c40bb57c74c94ade070024c1bc3925d9b
 +F src/vdbe.h 323218c4bfd64c719ba85d05fbc87cdd126991cadb39e73ccac7b59f30c3d53e
  F src/vdbeInt.h a76d5eed62c76bcd8de7afd3147fac1bc40c5a870582664bcd7d071ef437c37f
- F src/vdbeapi.c cde63790c9d18ba5941d52c9f49e1a862cf6503141d5b9c112a05eb0adbf30a9
+ F src/vdbeapi.c 0eb687d3287d6ab45661f7ffcabbda6f345713e800ef0f29053597933ca2a0bf
 -F src/vdbeaux.c 4fa28b32452f6197dba7c8780dde11576b9a6d8ce6f35adbb69efc3e7d37fa0c
 -F src/vdbeblob.c f5c70f973ea3a9e915d1693278a5f890dc78594300cf4d54e64f2b0917c94191
 +F src/vdbeaux.c 2f4fefdf74c484193de632c3c417c5886512f7a57f69a65dbdb858a58bc3f55a
 +F src/vdbeblob.c 08e58c6bef990008b8c2dbad4c99c56d3b622ee79433004484cce29b536e2ab9
  F src/vdbemem.c 3e89e087df928eba80e520824078dc563c579a0848b1557ac36845ec14392923
  F src/vdbesort.c 90aad5a92608f2dd771c96749beabdb562c9d881131a860a7a5bccf66dc3be7f
  F src/vdbetrace.c 79d6dbbc479267b255a7de8080eee6e729928a0ef93ed9b0bfa5618875b48392
@@@ -1374,7 -1366,7 +1374,7 @@@ F test/tabfunc01.test 20e98ffe55f35d8d3
  F test/table.test eb3463b7add9f16a5bb836badf118cf391b809d09fdccd1f79684600d07ec132
  F test/tableapi.test ecbcc29c4ab62c1912c3717c48ea5c5e59f7d64e4a91034e6148bd2b82f177f4
  F test/tableopts.test dba698ba97251017b7c80d738c198d39ab747930
- F test/tclsqlite.test 74cc8404f69e2c3aafbc9bc73a0e686aa91612b88284f9cfd868cb916b67f6b0
 -F test/tclsqlite.test 5a06962d8f18edf4703931f6b7dacd83678d02fa5c8ced9a7958c007ad58626a
++F test/tclsqlite.test b30e975cf2dc1c53ff98018065ac120ae43a81fb4fc5a94ddc80b9bcc2c012d6
  F test/tempdb.test 4cdaa23ddd8acb4d79cbb1b68ccdfd09b0537aaba909ca69a876157c2a2cbd08
  F test/tempdb2.test 2479226e4cb96f4c663eccd2d12c077cf6bda29ca5cc69a8a58a06127105dd62
  F test/tempfault.test 0c0d349c9a99bf5f374655742577f8712c647900
@@@ -1813,7 -1805,7 +1813,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 fa6008d547c6b24108a26e022f3f427fa19ffae006c88fee9de97d2244521de0
- R 1567a476e8cdb3371b0365a07a5c3e11
 -P d7d23f0450d659b2c7df34e4df8623ca7b6fe3bd19422e3e9234515214ae8510
 -R dc88e96e04121683ea3d6378eccdabf0
++P 0ce2092a5968d75d014fdc238391c362a9600c28bf18cdc631e98259a5278712 906d1fd8650874236e0bf5734d5347dcc45ec036164a56570fec37da4ffeaf8f
++R 0a4fdc60a78ba5a12c576da11b5b88c8
  U dan
- Z 4484645d45cf50908886b561d1cf845d
 -Z 97fe7239616646a62550c014b5d021f5
++Z 8334d61294986878168d00e5d51379c9

diff --cc manifest.uuid
index ffe72040a1954b432460a455c9f127d35074fcbd,821cac909ed6eb3d681eed581cbab83f6ec588dc..a091bf7896e33113724fa516990284c3312a3098
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 0ce2092a5968d75d014fdc238391c362a9600c28bf18cdc631e98259a5278712
 -906d1fd8650874236e0bf5734d5347dcc45ec036164a56570fec37da4ffeaf8f
++97a9604d85cf5044e8109e533d4682b25bfe6a110f403ebd0fdef03880059f37

diff --cc src/shell.c.in
Simple merge

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

diff --cc src/tclsqlite.c
Simple merge

diff --cc test/tclsqlite.test
Simple merge