Merge latest trunk changes with this branch.

FossilOrigin-Name: a22162593366c2d3be7eca2c64516cc2f2fffe876989dce47ef0966f306e32da

diff --cc manifest
index f0ea8818b31a92ac01ab3ebbcf10b263f1f9b8a0,8d2c2f1631edd5b14fcf4d493f5edc54c1eb01a5..add7e7cbc6f5498123dccd663ced357cca94092b
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\spatch\s3.35.3\sinto\sthe\sbegin-concurrent-report\sbranch.
- D 2021-03-26T13:47:41.800
 -C Merge\slatest\strunk\schanges\sinto\sthis\sbranch.
 -D 2021-04-02T20:40:52.286
++C Merge\slatest\strunk\schanges\swith\sthis\sbranch.
++D 2021-04-02T20:53:22.606
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -39,8 -39,7 +39,8 @@@ F configure.ac 4e4b58b32f88c8da9914a2f2
  F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad
  F doc/F2FS.txt c1d4a0ae9711cfe0e1d8b019d154f1c29e0d3abfe820787ba1e9ed7691160fcd
  F doc/begin_concurrent.md 4bee2c3990d1eb800f1ce3726a911292a8e4b889300b2ffd4b08d357370db299
- F doc/lemon.html 1bb72ece6271df0d901d233551dd985f2c6ba30d09382cf2d321ed951ab57491
 +F doc/begin_concurrent_report.md 58c032ebc2d5980e3b25bbe805f2addd31be787d1ebe51f74f4f48044fa9e2c0
+ F doc/lemon.html efc0cd2345d66905505d98f862e1c571512def0ceb5b016cb658fd4918eb76a3
  F doc/pager-invariants.txt 27fed9a70ddad2088750c4a2b493b63853da2710
  F doc/trusted-schema.md 33625008620e879c7bcfbbfa079587612c434fa094d338b08242288d358c3e8a
  F doc/vdbesort-memory.md 4da2639c14cd24a31e0af694b1a8dd37eaf277aff3867e9a8cc14046bc49df56
@@@ -486,13 -485,13 +486,13 @@@ F src/alter.c ee335771956c1b674ec5f3f94
  F src/analyze.c 01c6c6765cb4d40b473b71d85535093730770bb186f2f473abac25f07fcdee5c
  F src/attach.c 9cbe761e464025694df8e6f6ee4d9f41432c3a255ca9443ccbb4130eeb87cf72
  F src/auth.c 08954fdc4cc2da5264ba5b75cfd90b67a6fc7d1710a02ccf917c38eadec77853
 -F src/backup.c 3014889fa06e20e6adfa0d07b60097eec1f6e5b06671625f476a714d2356513d
 -F src/bitvec.c 8433d9e98dd6f2ea3286e0d2fe5d65de1bfc18a706486eb2026b01be066b5806
 +F src/backup.c 0d3f5004d5c85f257add00aee97687d40790a471a5d56306043ed9a7b53d6994
 +F src/bitvec.c a012cfe503cddd1df1a75c139baf4586acc32f25c66f79039caf1d06474434f2
  F src/btmutex.c 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6
 -F src/btree.c d20d20223840198f37e02a2e6816858e1373908003d793d762a2688f886dc557
 -F src/btree.h ccdc64bd1eee7ba79d4c0b2af22b6df1e5ededdbf9606f45f4fca4738dd6fa0b
 -F src/btreeInt.h 1e9f10107a4ec5d2940ae5b859242ae83b81402986724bed08b8491a5ea64a4d
 +F src/btree.c 56b9f23f6440b457face156e4bcd20b589eeb4068efb17468fe3ce59717d6ecb
 +F src/btree.h 888d9cea384478728e1e475e1660bd4138e3ec635f1b430e3f57e88d9c81d2fe
 +F src/btreeInt.h b8c4dee39e4cbe127a6cf479f32e345e186db63923e937b5f42807c76bfd8e9d
- F src/build.c 9f06854962aad6b5d465c38f9f6e8c307028fbb4efa9fccb0531f0874bd088df
+ F src/build.c 104c98c0c451c705065d1ee2bb6202477389cfaeeab72f67702b7380826c93af
  F src/callback.c d0b853dd413255d2e337b34545e54d888ea02f20da5ad0e63585b389624c4a6c
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
  F src/ctime.c 2a322b9a3d75771fb4d99e0702851f4f68dda982507a0f798eefb0712969a410
@@@ -509,10 -508,10 +509,10 @@@ F src/hash.c 8d7dda241d0ebdafb6ffdeda31
  F src/hash.h 9d56a9079d523b648774c1784b74b89bd93fac7b365210157482e4319a468f38
  F src/hwtime.h cb1d7e3e1ed94b7aa6fde95ae2c2daccc3df826be26fc9ed7fd90d1750ae6144
  F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
- F src/insert.c 7ebe2c0de0858292bf795cb485f096e9efff42d4ed959d57b70703ca05836bdc
 -F src/insert.c f8d462ab6174a2c30476b5a1fc77f4d66ce7d9dd45c994966b9f4445db1131f0
++F src/insert.c d13a5c85db12f7cf7fb09bd1c9c20b4f57eaca41bbc99fdb9f3a2632e2dbb50b
  F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
  F src/loadext.c 8c9c8cd2bd8eecdb06d9b6e89de7e9e65bae45cc8fc33609cc74023a5c296067
 -F src/main.c 5becd80bb8369fe73cea609ac830dd43453d0a356c56ef361fd74698988484a0
 +F src/main.c 985fba2ca304a27886d37ae2482d42f5ead58d9f296835f59f0902af9973d6c5
  F src/malloc.c c1af4ac5a463648cd2953fd4ac679b3ba9022ce5ec794a60806150ad69dfd33a
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de
@@@ -532,11 -531,11 +532,11 @@@ F src/os.c 2d6e646370b1aa78942c68d7edf1
  F src/os.h 48388821692e87da174ea198bf96b1b2d9d83be5dfc908f673ee21fafbe0d432
  F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
  F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586
- F src/os_unix.c cf0291562557b9ac19c7446f9c13c3cb593d2a0af2eb81913a2b983ff7a59f26
+ F src/os_unix.c 9ee493ab91a3b20f5671ff3b4447ddbb64ae653b013258f676d75f6f658414eb
  F src/os_win.c 77d39873836f1831a9b0b91894fec45ab0e9ca8e067dc8c549e1d1eca1566fe9
  F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
 -F src/pager.c 0122015aef06338c61d0b94df77bce4a670c0376dd88ec27260d0ba319d2f869
 -F src/pager.h fdc30693c403aa9b4293d0b126346db7e450f8f0e5d2c1bb8355acb1cb8da6fd
 +F src/pager.c 4f0fd96e2a425d3146d8b94364cebb44bc7ca76faa817ad33be5687ff7c9a8b7
 +F src/pager.h ed1f7bc91ceae75fa918d51f7c2ad071a5458cc3dc0085ca7577f8d51bf2d7cb
  F src/parse.y 3a7f2156485e377a637b4217b797001cf2ed9228e501f8d34fd06a9f46a40a73
  F src/pcache.c 385ff064bca69789d199a98e2169445dc16e4291fa807babd61d4890c3b34177
  F src/pcache.h 4f87acd914cef5016fae3030343540d75f5b85a1877eed1a2a19b9f284248586
@@@ -544,22 -543,22 +544,22 @@@ F src/pcache1.c 388304fd2d91c39591080b5
  F src/pragma.c eb42cb9bec189cf18cef5d8fcae56e13bb73ef2b019b198fb48740ced81bce95
  F src/pragma.h b93fd693bd38cefeaf8e2c7e8c929717f7799a9770104cdd2bae8df2a84e2da7
  F src/prepare.c e21b54489b5c73b06ada15e6fc79b5c6f64b06701924a6ca98944ae59e06256f
- F src/printf.c 2b03a80d7c11bb422115dca175a18bf430e9c9dbaa0eee63b758f0c022f8f34f
+ F src/printf.c 78fabb49b9ac9a12dd1c89d744abdc9b67fd3205e62967e158f78b965a29ec4b
  F src/random.c f27af4099afaea7284ade5c206224dcfdb2334cfd119d018b470d46356b3f27d
- F src/resolve.c dd47248c2c914feb0d4428c27d782e2723971d32cfa5536f49306d080df4d45a
+ F src/resolve.c fc136d935f19966747663bed605ad7f06f84f9fe7bf7bf79e9bf844ef5c7556d
  F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
- F src/select.c bdcfed8ae9cb311f145fd204be32e3d03f7bf359c796159900d1eec0b557991b
- F src/shell.c.in aa28256887d049badaf93aa30ab5c76a2ec88143a674d685c0e739056702e5c3
- F src/sqlite.h.in 87051ea1e024186354ace08b93824a0baeeecfbc3733a40435d5c0518ee556be
+ F src/select.c 2bc2bac7de5024adf3bb218462e593e35b945f1660488769c0ebe7891e26d948
+ F src/shell.c.in dcce260883836c9b58847505fbccce8d5546af925046f7dacd9443e922ece036
 -F src/sqlite.h.in d1ce4ee7d0571319a73c6d69e28d11dce1769382ac9d4a95b2847bd875c08fcf
++F src/sqlite.h.in cd68c86bf2c2bca6406085564268ec77e0e8acad3e447ce5d887ef211429d323
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h 61b38c073d5e1e96a3d45271b257aef27d0d13da2bea5347692ae579475cd95e
- F src/sqliteInt.h 19e6e608d65ae0b82a6e2918e289b5eada11c7ce10255298677d00bf2d7df5cf
 -F src/sqliteInt.h e2924d739b2f3784bcda083ffa53ba5bea87963cff4c672e43264f92bbf4504b
++F src/sqliteInt.h 8659e0f7bbf7d6f4438262e7699f943df476788569ddc4578809aa56d7723946
  F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657
  F src/status.c 4b8bc2a6905163a38b739854a35b826c737333fab5b1f8e03fa7eb9a4799c4c1
  F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
  F src/tclsqlite.c 986b6391f02cd9b53c1d688be55899f6ffddeb8e8014cd83c1b73ff912579a71
- F src/test1.c 8f00a276e2db0737cc062b0c6bce7638187518a0607ee780c1892444d7b43f7c
 -F src/test1.c bb6fe83c5a0e255930c14cc6f0b29414410661839fcdd95015abed823df636b4
 -F src/test2.c 3efb99ab7f1fc8d154933e02ae1378bac9637da5
++F src/test1.c 460024efcc596adf9a4a860de53806a2ac013532af846e6f978d7c434af27d69
 +F src/test2.c cb988be1ee1b972dc471e6b076087cfa9cb9ce5c2aa31e98ecf41c3256a72a53
  F src/test3.c 61798bb0d38b915067a8c8e03f5a534b431181f802659a6616f9b4ff7d872644
  F src/test4.c 7c4420e01c577b5c4add2cb03119743b1a357543d347773b9e717195ea967159
  F src/test5.c 328aae2c010c57a9829d255dc099d6899311672d
@@@ -620,11 -619,11 +620,11 @@@ F src/upsert.c df8f1727d62b5987c4fd302c
  F src/utf.c ee39565f0843775cc2c81135751ddd93eceb91a673ea2c57f61c76f288b041a0
  F src/util.c 41c7a72da1df47864faa378a1c720b38adb288c6838cb6be5594511b6287a048
  F src/vacuum.c 9d6ac090ff36d80f0a2c5bfc63994b714c464bfc44efa5056c457a6a4163dc99
- F src/vdbe.c 655b748e3af7fe47192ed1aef0e1acb9f2a4cba9539c0d28b373f04622ee3513
 -F src/vdbe.c 619f5a46e9b7de7e9791b795364d400efccedca48a2dab044909bb4ff5a220ab
++F src/vdbe.c e5023454125d60b989ccd52caf3d2fcbec2fea52322ff3205f345ee5848fff4a
  F src/vdbe.h 25dabb25c7e157b84e59260cfb5b466c3ac103ede9f36f4db371332c47601abe
 -F src/vdbeInt.h 000d9ab1ea4cb55a80de15e28f3f595645b4fddef34bca4347fb3db8031d9041
 -F src/vdbeapi.c 4a43e303ec3354c785f453e881521969378e85628278ab74ba4a9df790c0d93b
 +F src/vdbeInt.h 5762107e9092be62790460ead0972c6e77146b8c5a63dd2bd41718c3ae9f499d
 +F src/vdbeapi.c d8f8c94303d8455f4152aa9bbff2217feb06486df94694313421cf3c8bd0378c
- F src/vdbeaux.c cf79a11bff51f6b99fc898d10117f4ec289edd92858fae313a3ff8c4f0c60f0f
+ F src/vdbeaux.c 816663d5ab438d5bf373aaab876de8bb5c05ba08d4dd7cf74c3fd6937c796b07
  F src/vdbeblob.c 253ed82894924c362a7fa3079551d3554cd1cdace39aa833da77d3bc67e7c1b1
  F src/vdbemem.c 947f2a65910edb4014dc981d33e414a68c51f169f9df8c4c493a0ba840b6eb1f
  F src/vdbesort.c f5b5e473a7cee44e47a94817b042fd7172cf3aa2c0a7928a8339d612bcfdec5a
@@@ -635,11 -634,11 +635,11 @@@ F src/vxworks.h d2988f4e5a61a4dfe82c652
  F src/wal.c c9dfe3054c82aaa8d1dea91b56afa9397b54e55d5fb1dcbac32a4a7f6231bdc9
  F src/wal.h 7ffe787437f20a098af347011967a6d3bb8e5c3dc645e6be59eff44d2b2c5297
  F src/walker.c d42d6c80ea363ef689a462e65eefcfe87deab924c50de5baa37ecb6af7d7ddaa
- F src/where.c 10d06b16670a1d2a992d52a9f08e49426d38a08fb0a7ae5f7f62fd023d560e1e
+ F src/where.c 07d1232df6fc4705815b0ef5182fe3e56bdba6ac09ce52bd66ecb207626aac2b
  F src/whereInt.h 446e5e8018f83358ef917cf32d8e6a86dc8430113d0b17e720f1839d3faa44c4
- F src/wherecode.c c515843650fb9d8314839effeed1fcbb2f6873a7b40f06f3dfb5d620db16d024
- F src/whereexpr.c 53452fe2fb07be2f4cb17f55cc721416fae0092c00717f106faf289c990b6494
- F src/window.c 7e89ac4b6cd6bb9b7772234a625d19c39b530f4ac06e43688a8b7e6a1ab512a2
 -F src/wherecode.c c7354c9749f015f37bc32e15a4257a5155fa5d2b79f605f528bd09f3b9f1b4e6
++F src/wherecode.c 086795ef42b39ec61563f9fc5a004b77c11782826e8f3316a6b945a6b04f4c85
+ F src/whereexpr.c 4ba94b8ebbff97c658b212de6ccdb6d3a41847800bdf99e7a2a967c250269f2c
+ F src/window.c 32b03808aff2e7263889cce0cbcb2a68efefc2a9d5187514ddb6a2a1046dc7f5
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
  F test/affinity2.test ce1aafc86e110685b324e9a763eab4f2a73f737842ec3b687bd965867de90627
  F test/affinity3.test eecb0dabee4b7765a8465439d5e99429279ffba23ca74a7eae270a452799f9e7
@@@ -779,9 -779,8 +780,9 @@@ F test/collateA.test b8218ab90d1fa5c59d
  F test/collateB.test 1e68906951b846570f29f20102ed91d29e634854ee47454d725f2151ecac0b95
  F test/colmeta.test 2c765ea61ee37bc43bbe6d6047f89004e6508eb1
  F test/colname.test 87ad5458bb8709312dac0d6755fd30e8e4ca83298d0a9ef6e5c24277a3c3390e
- F test/columncount.test eff33d402a7b0fde0a52a1920d238af200ca573327021e0ce3b7e5688de41449
+ F test/columncount.test d86fb6307261186370698962790ad2088ed419e4a4e823512b502f17d443b1b7
  F test/concfault.test af01b1f6cca45b8f17bb13b4406ec43ab1689181a08850b990596c7a9f4e656f
 +F test/concreport.test 08b32b6e042ded033a822d086a22b7acfdf118c23fd0c124fee685723175a942
  F test/concurrent.test a0248ec6e3e79a5948453649cf86b5b359175cba55ea636b15426d6f0fa6c3da
  F test/concurrent2.test de748c7dd749c77e2af2c4b914b9b09a28ac09608042ca498c0251dc6f46aa1a
  F test/concurrent3.test 530671ac706f6a1d0f4992dbdd33a86408330d03cd90fb9e82ecb1b27f5fd081
@@@ -1928,7 -1928,7 +1930,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 27f8f56b98275fcd054b7f7477e0c99711b7a249b8df62647214a711c94bdb48 7e4c48afcc662940afe3ad976fcd75d71150e66461ad2d09c103eb0e238674a3
- R ed1ff9c820b3a35e27bd314108f0d406
- U drh
- Z b4ae35fa91cb49d78189777f1734dd38
 -P 7e4c48afcc662940afe3ad976fcd75d71150e66461ad2d09c103eb0e238674a3 e16da5af822ef31d7e05992403cf9787fbb3d9abb0b5283aba55ea07e1830a72
 -R b53cf84e58ab748337d3f52b704625fe
++P 4ba9fc34c5670fe4d0316b2bcbd57d18111ff1cbf10df98427770c385a376ced a7e612ee8fd942cf766e5304912161ee0b76ea21f32c7b7a72e048b73ed2a9e4
++R 94015783a9a8f84debba7c65c15bcaff
+ U dan
 -Z 31964ab94773c5d7b1af919c564ddd8a
++Z 61cf0426312aa7cae4bc61949f7f4a02

diff --cc manifest.uuid
index 5de4a98e755cb8ef1ea53444d9f17a50bfa6de6f,3f6c18a18f67177eb534b32ebf04ebcd88242067..31cce245859adbbd133c897d1f6a3b13649a49c5
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 4ba9fc34c5670fe4d0316b2bcbd57d18111ff1cbf10df98427770c385a376ced
 -a7e612ee8fd942cf766e5304912161ee0b76ea21f32c7b7a72e048b73ed2a9e4
++a22162593366c2d3be7eca2c64516cc2f2fffe876989dce47ef0966f306e32da

diff --cc src/insert.c
Simple merge

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

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/test1.c
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc src/wherecode.c
Simple merge