Merge recent fixes from trunk.

FossilOrigin-Name: 9c920bbad3d0a79279e8ff89a01d0f197c77d0a530ac51c57e57fe6db316c905

diff --cc manifest
index f31295504f0226f537ff994626a4b221247f1251,99c48db20e24195c18efa3ddfc6c45b970a7ca8d..bab0108aa03d23b6c7e7d507b5b2ca2efcd5d662
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\sa\scouple\sof\stest\scase\sissues\son\sthis\sbranch.
- D 2020-01-18T19:58:06.512
 -C In\sthe\sfuzzcheck\stest\sprogram,\sreduce\sthe\sdefault\sexpression\sdepth\slimit\nfrom\s1000\sto\s500\sto\savoid\sstack-overflow\sproblems\swhen\srunning\sstress\stests\nusing\sclang\sASAN.
 -D 2020-01-20T14:42:09.493
++C Merge\srecent\sfixes\sfrom\strunk.
++D 2020-01-20T15:32:47.769
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -476,27 -475,27 +476,27 @@@ F src/btmutex.c 8acc2f464ee76324bf13310
  F src/btree.c 7af5ff0f88ba856c2681f6eeb457590b24f787e994f18cbdb44c2de2d33f757e
  F src/btree.h 6111552f19ed7a40f029cf4b33badc6fef9880314fffd80a945f0b7f43ab7471
  F src/btreeInt.h 6794084fad08c9750b45145743c0e3e5c27c94dee89f26dd8df7073314934fd2
- F src/build.c b22d3580d09eccb8779b6a08a20b79289d73058c16c779c54b8454eee6d5ef77
 -F src/build.c 2394d2c853088106dfc1cf485d609f20e6421d7c84892b795824e454f78e50ad
 -F src/callback.c c547d00963ae28100117b4fb1f0f32242109b5804374ee3bfe01138a54da7f76
++F src/build.c 9edbf33eba02233a9040d43786dce0980f2a4a827b8dffd4b332461f19f6c8ab
 +F src/callback.c a3ed3fefacda1382f1ac4288a2fa15046f1e0d8418e3a281e501c9f0b52d5188
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
 -F src/ctime.c 1b0724e66f95f33b160b1af85caaf9cceb325d22abf39bd24df4f54a73982251
 +F src/ctime.c 15d1010037db3577d2e90e793197c539e86860ab272d7a49e4e976425d0eba62
- F src/date.c e1d8ac7102f3f283e63e13867acb0efa33861cf34f0faf4cdbaf9fa7a1eb7041
+ F src/date.c 6c408fdd2e9ddf6e8431aba76315a2d061bea2cec8fbb75e25d7c1ba08274712
  F src/dbpage.c 8a01e865bf8bc6d7b1844b4314443a6436c07c3efe1d488ed89e81719047833a
  F src/dbstat.c 0f55297469d4244ab7df395849e1af98eb5e95816af7c661e7d2d8402dea23da
  F src/delete.c a5c59b9c0251cf7682bc52af0d64f09b1aefc6781a63592c8f1136f7b73c66e4
  F src/expr.c 003c59158b33d7f3b198122cb0d1e13c06517cc3932e56b42283eb0e96696d66
  F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 -F src/fkey.c 92a248ec0fa4ed8ab60c98d9b188ce173aaf218f32e7737ba77deb2a684f9847
 +F src/fkey.c 2d234423b9aaf3b59dc8e0ee361f47ddf7806f655c94f75abfa74638c71f2025
- F src/func.c 259496e4856bd0a3215d16804992f3339f3e8db29f129a5a7285c341488bbe9c
+ F src/func.c 92249abc3fd7e52b249ca8eb2d15a617f70819d2fa4c777a4a33552b89bfb322
  F src/global.c 59601d885a0dbbfbd22ed2d030424a5e7f1b9809a17ca46686058bbc4a55e980
  F src/hash.c 8d7dda241d0ebdafb6ffdeda3149a412d7df75102cecfc1021c98d6219823b19
  F src/hash.h 9d56a9079d523b648774c1784b74b89bd93fac7b365210157482e4319a468f38
  F src/hwtime.h cb1d7e3e1ed94b7aa6fde95ae2c2daccc3df826be26fc9ed7fd90d1750ae6144
  F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
- F src/insert.c 5ba8fd376f539240939ae76b5bc9fa7ad9a0d86e9914ecd11eb7002204138c11
+ F src/insert.c 2fe4d7f67078a68650f16e4efe73207899e21702e6b9d2e8ad1894c76dcad352
  F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
  F src/loadext.c 8cd803f1747c03a50b32fe87ebfb5851998d0cdafefe02737daa95e0616b42bb
- F src/main.c c9f8a7005341d833c2879ec24ecf224ae979cd14d33c42b0b895bd4f8d66fb8e
 -F src/main.c 430db07f140a2455784b504af1a56fe49134a79dd479a203370490031708d48f
++F src/main.c 07050326b630b2211b169df6a213004b78fd753660c9004a86c74e4c05c1a03c
  F src/malloc.c eaa4dc9602ce28b077f7de2eb275db2be270c5cc56d7fec5466301bd9b80e2f5
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de
@@@ -525,23 -524,23 +525,23 @@@ F src/parse.y c8d2de64db469fd56e0fa24da
  F src/pcache.c 385ff064bca69789d199a98e2169445dc16e4291fa807babd61d4890c3b34177
  F src/pcache.h 4f87acd914cef5016fae3030343540d75f5b85a1877eed1a2a19b9f284248586
  F src/pcache1.c 6596e10baf3d8f84cc1585d226cf1ab26564a5f5caf85a15757a281ff977d51a
- F src/pragma.c 21e7a213702f29fe652e7b856b3bde55070c889957b5c04da68985b1eaa5f39d
 -F src/pragma.c 0d49d43b22d66397aa026db505457f6683d8a66cd0a4f9db2e6776156bda716c
 -F src/pragma.h 9f86a3a3a0099e651189521c8ad03768df598974e7bbdc21c7f9bb6125592fbd
 -F src/prepare.c 6049beb71385f017af6fc320d2c75a4e50b75e280c54232442b785fbb83df057
++F src/pragma.c 76563bedaeba1de2151934c0aa35108fb0cff537bc53df39d50fca02253a8e32
 +F src/pragma.h 3b8fc00c101f379352e1c733ce9c5180ac6826575d0cca118c6e70fd20664d02
 +F src/prepare.c 9e8f3d609602eb51b8224fca3dc9a0d30392937cec147955ca5e11c6cc5f65ef
  F src/printf.c 9be6945837c839ba57837b4bc3af349eba630920fa5532aa518816defe42a7d4
  F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
- F src/resolve.c 1139e3157c710c6e6f04fe726f4e0d8bdb1ae89a276d3b0ca4975af163141c9c
+ F src/resolve.c f0781c9e180028b279bc4ff079ad54f4727223d470c8d2343643fcaf79b67740
  F src/rowset.c d977b011993aaea002cab3e0bb2ce50cf346000dff94e944d547b989f4b1fe93
- F src/select.c 924b61cef57033a8ca1ed3dcffd02445a7dd0c837cc849b2e4117251cac831f5
- F src/shell.c.in 6d2c6d34db31b59ab36ddc3ec77158b848bd3ffe54f6db9b2b519875990a7095
- F src/sqlite.h.in c7784a160e407b0b602f6a2c22ba43c1c6621d2378880509f04c8cd1e891e353
+ F src/select.c 1b787876c0f3052ccd27490a350ab181281e9833f455ee273bee0a0c8a94765d
 -F src/shell.c.in c2e20c43a44fb5588a6c27ce60589538fbf4794fd7686f5b2598eca22eaae1fa
 -F src/sqlite.h.in 71e469c466eccd7d76da5938f2e236b92d089b5acb930f1c8cb6ce2fa6b247b0
++F src/shell.c.in 8a06de3e55e49df49eca5132dacda0057b397d3faeca8a3f943c9b536af35d7f
++F src/sqlite.h.in 64750052b9aba9f17659d760dc2040650e234e1566e48d7a61d8742a5247e958
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h b0f776a0d042b23b6bcbb6b0943e8a3768c7f0b438a275e7168f0204e223a4db
 -F src/sqliteInt.h 7a29ba700a51eeb925731749a570cf3859f6a58ed94797ecf47508875b0ba279
 +F src/sqliteInt.h be6a29e1fc0b9340b412a616b1b685dfa057ac3c6817b2bdcd3b071d4d4fa355
  F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b
 -F src/status.c 9ff2210207c6c3b4d9631a8241a7d45ab1b26a0e9c84cb07a9b5ce2de9a3b278
 +F src/status.c f6e2b6c37873620ce2cb597f5606a1c9adca4c0db1ff3a08a37231e920d21985
  F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
- F src/tclsqlite.c adf091277c67f47e0cdfdedfa2231777340021e26d7108192b32b9fce4308d1d
 -F src/tclsqlite.c 97590069efaba5a4928ecffb606e3771dd93ee8e6bf248a62a6507c37a2b2e46
++F src/tclsqlite.c 400c8d6d7b3d79d0ccbf37966ad8795d23eb994b91d9b9d16e03ffe3378cc3d3
  F src/test1.c 4d0ab2f67053a4fff87d1d3586ecc0e5322a1fc45dd4119ab11dc96de44f17a1
  F src/test2.c 3efb99ab7f1fc8d154933e02ae1378bac9637da5
  F src/test3.c 61798bb0d38b915067a8c8e03f5a534b431181f802659a6616f9b4ff7d872644
@@@ -603,24 -601,24 +603,24 @@@ F src/trigger.c 8256290482385fad62daaf9
  F src/update.c 9ad19af96aff95dc02a923a99f97c1bc0b909009a29a2914b796f786b9ac0c60
  F src/upsert.c 2920de71b20f04fe25eb00b655d086f0ba60ea133c59d7fa3325c49838818e78
  F src/utf.c 736ff76753236ffbc8b5b939f5e0607f28aeaa7c780b3a56b419228f0a81c87b
- F src/util.c e5f3971160154e5c9b660fd119b02ec4890e87cd18a5bc4d45ee60cddbb9e6a2
+ F src/util.c d035b09df9cecbc0e8f07c34b815acbf0d43c8adc8d2c540e3dc92eecb27855a
 -F src/vacuum.c 82dcec9e7b1afa980288718ad11bc499651c722d7b9f32933c4d694d91cb6ebf
 -F src/vdbe.c e3dd230ece613409507523e68436764cc20638bb77ba2f416097de5b37235ce1
 -F src/vdbe.h defd693289c7bb8d325f109be9490c77138061211a116827da7244b6015a4934
 +F src/vacuum.c 5b9b4771ffb47aaef038c4ad5f1acd76dfbc9e0a4f101c1ba7f7ac9c2ba96374
- F src/vdbe.c 8877d4f3ca4c6375fbf437ee3aa214bafe248b0fc063e1d32fb2cd2b22edfc41
++F src/vdbe.c bc12e1fe236bea3ed08a2b7a03a0482858ec66d2c3548ea28db0d6c3a56f257a
 +F src/vdbe.h dfe0c985275820175d9ffb21372de10a651823957ce8aadd055c812bc76db83c
  F src/vdbeInt.h 30d3e8b991547cdf39025e416a0a737b0416d46747af70ae058f60e2e0466fe7
  F src/vdbeapi.c 1252d80c548711e47a6d84dae88ed4e95d3fbb4e7bd0eaa1347299af7efddf02
 -F src/vdbeaux.c ff690e6c9314ef281de7c06f8c8c33393f0afca80aabb1fe69836dcf2d60b0bf
 -F src/vdbeblob.c 253ed82894924c362a7fa3079551d3554cd1cdace39aa833da77d3bc67e7c1b1
 +F src/vdbeaux.c eafd650c15e201bdd796b5f5f4e573a652b5a5ee69f6b24fcc5b89e7ebc2d977
 +F src/vdbeblob.c 40028e015fe557a945c99edb6cbf844ea96d853c3e8ac4eb5c1e49bff59f154e
- F src/vdbemem.c ad9e6217635f2b04df98bc57b12c98cefc9c0a1745cca47f4e8109119213253d
+ F src/vdbemem.c 6200af702c87105d5b00d8ac5f5fa2c6d8f796aa974dbe2d15dcd95379ba1fa7
  F src/vdbesort.c a3be032cc3fee0e3af31773af4a7a6f931b7230a34f53282ccf1d9a2a72343be
  F src/vdbetrace.c fa3bf238002f0bbbdfb66cc8afb0cea284ff9f148d6439bc1f6f2b4c3b7143f0
 -F src/vtab.c 7b704a90515a239c6cdba6a66b1bb3a385e62326cceb5ecb05ec7a091d6b8515
 +F src/vtab.c 0119233719474ebefeea02f3bc9c08edcb2e409dbf7ed0820060223be8122aff
  F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
- F src/wal.c 15a2845769f51ba132f9cf0b2c7a6887a91fc8437892dbcce9fcdc68b66d60a1
+ F src/wal.c dbc77159e6734c2d64343cb8624ad245d89dd79a5010750fce8118b3fa7be2e8
  F src/wal.h 606292549f5a7be50b6227bd685fa76e3a4affad71bb8ac5ce4cb5c79f6a176a
  F src/walker.c a137468bf36c92e64d2275caa80c83902e3a0fc59273591b96c6416d3253d05d
- F src/where.c df2bea0e0122e853d9f1a8ec68920744166d2a524e338eba92e5470538ecd1f9
- F src/whereInt.h e1d1db6bbec0ba4f345acc338f956c8237a6f06413afa68c6414e82fb5b06745
+ F src/where.c 2005d0511e05e5f7b6fb3be514b44f264f23d45f3b0cc5e150c63e3006a003e5
+ F src/whereInt.h 9157228db086f436a574589f8cc5749bd971e94017c552305ad9ec472ed2e098
  F src/wherecode.c ec8870d6fe79668dd12d7edc65ae9771828d6cdfe478348c8abd872a89fdbadd
  F src/whereexpr.c 4b34be1434183e7bb8a05d4bf42bd53ea53021b0b060936fbd12062b4ff6b396
  F src/window.c f8ba2ee12a19b51d3ba42c16277c74185ee9215306bc0d5a03974ade8b5bc98f
@@@ -1413,7 -1404,7 +1413,7 @@@ F test/tabfunc01.test 5ca6d004157a3e886
  F test/table.test eb3463b7add9f16a5bb836badf118cf391b809d09fdccd1f79684600d07ec132
  F test/tableapi.test ecbcc29c4ab62c1912c3717c48ea5c5e59f7d64e4a91034e6148bd2b82f177f4
  F test/tableopts.test dba698ba97251017b7c80d738c198d39ab747930
- F test/tclsqlite.test 13aef7a9fca1a4d43124636489f7676f8aabcfd030ebba4d315b5b38dee43c9f
 -F test/tclsqlite.test 79a473f5797e317c08f2c4f8192edb3eea6a67329b1087453328b66a7cb31070
++F test/tclsqlite.test 9ad3f8d337ae8e460b25d82094ff1b4f180afc3ca73856ec5a90ac215f43906c
  F test/tempdb.test 4cdaa23ddd8acb4d79cbb1b68ccdfd09b0537aaba909ca69a876157c2a2cbd08
  F test/tempdb2.test 353864e96fd3ae2f70773d0ffbf8b1fe48589b02c2ec05013b540879410c3440
  F test/tempfault.test 0c0d349c9a99bf5f374655742577f8712c647900
@@@ -1867,7 -1857,7 +1867,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 7a4ec57985fc5d980048bb7f1677452fb8cc4825cff8956760a1747b81b648bb
- R 22c006cb90288e9bfde9433d4049aba3
- U dan
- Z 0d529b77e415e00fa32a982dd2d1619f
 -P 4d46255096671ae7be33081e81bb25561304e069f459ffa7587f1f19381a1851
 -R 763d19098498df493f3b146f30ba61d0
++P 9830a44bc65e1176ca11ae84d7a291e6986662d2bbac5e352ae6e2423358c60b 63d886f4ce3c770498b8bdad45b04143a3f63197d81793bde107450aba4a9c87
++R cd491140da36b0a76a65a6104a079ed7
+ U drh
 -Z 3cfea19fe4fc4879265658e2adbc5ee0
++Z d912436ab0c4dcabadc5679d89fb1a75

diff --cc manifest.uuid
index 82111f9ef7a570ddc3064a4013f06843209a3726,f1b4d69cc4046c1949c376a80d3851cfa0c09d2c..21ce272dbf5b979ccaef59db75d9057b6786534d
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 9830a44bc65e1176ca11ae84d7a291e6986662d2bbac5e352ae6e2423358c60b
 -63d886f4ce3c770498b8bdad45b04143a3f63197d81793bde107450aba4a9c87
++9c920bbad3d0a79279e8ff89a01d0f197c77d0a530ac51c57e57fe6db316c905

diff --cc src/build.c
Simple merge

diff --cc src/main.c
Simple merge

diff --cc src/pragma.c
Simple merge

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

diff --cc test/tclsqlite.test
Simple merge