Merge all recent trunk changes into the begin-concurrent-report branch.

FossilOrigin-Name: 0770f320b9c957fec3a73f0859e71f7c9ee2acb1ef150f5cfb67298b1744e8c3

diff --cc manifest
index a722b4bfeb03fbe6f6da7bdd01d451254f17bcdc,9a2b856dce118168ef671bfa72b04fcb77037910..5dc3325e23a7eb70788d2d6279a5503d428a749a
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\srecent\strunk\schanges\sinto\sthe\sbegin-concurrent-report\sbranch.
- D 2021-10-04T12:16:27.667
 -C Merge\strunk\senhancements\sinto\sbegin-concurrent-pnu\sbranch.
 -D 2021-10-21T14:27:00.241
++C Merge\sall\srecent\strunk\schanges\sinto\sthe\sbegin-concurrent-report\sbranch.
++D 2021-10-21T14:37:17.810
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -489,37 -488,37 +489,37 @@@ F spec.template 86a4a43b99ebb3e75e6b9a7
  F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b
  F sqlite3.1 fc7ad8990fc8409983309bb80de8c811a7506786
  F sqlite3.pc.in 48fed132e7cb71ab676105d2a4dc77127d8c1f3a
- F src/alter.c a6afe961ef3544104fa635a0c3161bfe1a34382f32e2a28706993abadedbffed
- F src/analyze.c 979b6d2cdaca992a9c9f0818de55d08fb9a4e52929a509752b52d9fd23bb86d3
- F src/attach.c a514e81758ba7b3a3a0501faf70af6cfc509de8810235db726cfc9f25165e929
+ F src/alter.c d6b32481211fd5628b31d86329df6434bfc92e3372b53215339dc8cb47408644
+ F src/analyze.c 7518b99e07c5494111fe3bd867f28f804b6c5c1ad0703ec3d116de9bab3fa516
+ F src/attach.c e3f9d9a2a4a844750f3f348f37afb244535f21382cbfcd840152cb21cb41cfaf
  F src/auth.c f4fa91b6a90bbc8e0d0f738aa284551739c9543a367071f55574681e0f24f8cf
 -F src/backup.c 3014889fa06e20e6adfa0d07b60097eec1f6e5b06671625f476a714d2356513d
 -F src/bitvec.c 3907fcbe8a0c8c2db58d97087d15cdabbf2842adb9125df9ab9ff87d3db16775
 +F src/backup.c 0d3f5004d5c85f257add00aee97687d40790a471a5d56306043ed9a7b53d6994
- F src/bitvec.c a012cfe503cddd1df1a75c139baf4586acc32f25c66f79039caf1d06474434f2
++F src/bitvec.c e67e4ebed581b5f0aa9155abd88177ed8b63eb40e9266b1483ce7f6eb9257477
  F src/btmutex.c 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6
- F src/btree.c d7098c6817b456bc03b7f9abac09b296bfc15940ba61009e9fe743fe3c6de4ad
 -F src/btree.c 93a0ee8eee6e4ab8233a1ee79223eda7c649f85129e57c5d63e7b6f24bd9977f
 -F src/btree.h 900067641b64d619e6e2a93bd115c952a52f41d3bee32e551e2a4ceee05fc431
 -F src/btreeInt.h 3f19f0be5af0b68cff55e58df4b11e7a0692d9e8a820ceaeba4084659a86cf28
++F src/btree.c f7f98daa520db26721e3629c8c26927fafa70666b98f3c1f8dc530281e89952d
 +F src/btree.h 1c1508834794c0d15fe15d23792cd42deefd8140ad782899eab258d081a0adfc
- F src/btreeInt.h b8c4dee39e4cbe127a6cf479f32e345e186db63923e937b5f42807c76bfd8e9d
- F src/build.c 0d7fb44fae1f9dfe3872f4d38a71072bc735254651799d890d3794fb95ecb69e
- F src/callback.c d0b853dd413255d2e337b34545e54d888ea02f20da5ad0e63585b389624c4a6c
++F src/btreeInt.h 614e75ff0bfdd26f4270ba178cd5a41f904aee7be203612fbe7fc2215fc83d9c
+ F src/build.c 3638d6e7dbb47ab1e05ac0ec89323d3b35579689f077159ebab7711954fdff89
+ F src/callback.c 106b585da1edd57d75fa579d823a5218e0bf37f191dbf7417eeb4a8a9a267dbc
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
  F src/ctime.c 8159d5f706551861c18ec6c8f6bdf105e15ea00367f05d9ab65d31a1077facc1
- F src/date.c 467848d8187382764e37fd7678d6825cdfb90d9e564648527ed832e999ea7b85
+ F src/date.c fa928630fecf1d436cdc7a7a5c950c781709023ca782c21b7a43cc7361a9451e
  F src/dbpage.c 8a01e865bf8bc6d7b1844b4314443a6436c07c3efe1d488ed89e81719047833a
  F src/dbstat.c 861e08690fcb0f2ee1165eff0060ea8d4f3e2ea10f80dab7d32ad70443a6ff2d
- F src/delete.c 3ce6af6b64c8b476de51ccc32da0cb3142d42e65754e1d8118addf65b8bcba15
- F src/expr.c ebc76aa98b9bcd556c2855942c18f4d2f52c6504c13f7285413026bdd1c7bbf5
+ F src/delete.c 0c151975fa99560767d7747f9b60543d0093d9f8b89f13d2d6058e9c83ad19e7
+ F src/expr.c 529f7eca2821e874a375b1b318e697d62cb28f56069677c93f587f2de5dceb54
  F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
- F src/fkey.c 1905af1821b88321e1bb9d6a69e704495b6844a9b6c29398d40117cc251e893c
- F src/func.c f2516e2bf3b806a8afe38cb7e245708a09981ef596f410fa47310a4ef47c8d75
- F src/global.c 612ea60c9acbcb45754c2ed659b4a56936a06814718e969636fedc7e3b889808
+ F src/fkey.c 187b67af20c5795953a592832c5d985e4313fe503ebd8f95e3e9e9ad5a730bb5
+ F src/func.c a5dce8a8ff85310e2c88262a25bcded0a7e92be9a4bda24bbf6eab78e99c2f13
+ F src/global.c 59bfd5705a623f0b45e91622699953cfd1be2c176e78d8ff610463f2ea4ec51b
  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 307a1005280b86f18435e1abc6f35e28eacc811bfe000aefd178f65725a182ae
 -F src/insert.c b32e2dcbca838cb8acd4777a59243db4bcea53089e3181b0ea3e4dc75b43aeff
++F src/insert.c 04fc6e40fc8c72c4bedcb562bc5647d454e82c6abe5ab0968f269b005d2e1cad
  F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
  F src/loadext.c 0aa9e7f08e168e3874cb54984408e3976dafdf5616d511952c425b5ac088ea3e
- F src/main.c 5b588916aedb8cde887d0c54c3dd3358c40096645a85a41e21119f257ec3a955
 -F src/main.c 7128184e581e79689a283647e804dbbbaff88bdf1fe7e77046adbb39b1d37b38
++F src/main.c eafeeb719ed3b95b78ef45e7721ee26a60c3abf011f94cdfc2dbe60a078ef0ed
  F src/malloc.c ef796bcc0e81d845d59a469f1cf235056caf9024172fd524e32136e65593647b
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de
@@@ -539,12 -538,12 +539,12 @@@ F src/os.c 91fc69f95ef0528368174dca20f0
  F src/os.h 26890f540b475598cd9881dcc68931377b8d429d3ea3e2eeb64470cde64199f8
  F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
  F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586
- F src/os_unix.c 20614e98809738c27daeb38d8a298b748508059879300e5a20f6d20fa4103257
+ F src/os_unix.c 5d4a80fe497e48d87078e67ea88e9e44cd714dc02b9f1f20f40831883f81411d
  F src/os_win.c 77d39873836f1831a9b0b91894fec45ab0e9ca8e067dc8c549e1d1eca1566fe9
  F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
- F src/pager.c 0cf639120491a5e5e2622f8d4cc369a1ef9292e86828ea45bacb32939c90bd77
 -F src/pager.c 3c8211b75001c9a625fe9f4a48c705345bc46494456c3ac6235d8c170ef0b99b
 -F src/pager.h fdc30693c403aa9b4293d0b126346db7e450f8f0e5d2c1bb8355acb1cb8da6fd
++F src/pager.c 0017d8d4fd0f70ab5db8e77d38c67475356d99253b3eda66280585321a8cfd8a
 +F src/pager.h ed1f7bc91ceae75fa918d51f7c2ad071a5458cc3dc0085ca7577f8d51bf2d7cb
- F src/parse.y 6a20fbf70d4eeb36bd7030b96d55ed4da83b728eff4467f21ddfedb4c04ef073
+ F src/parse.y 59631359574901cc5cd4780939a6740f6bc597bd473334e744c1a1c32d9adef3
  F src/pcache.c 084e638432c610f95aea72b8509f0845d2791293f39d1b82f0c0a7e089c3bb6b
  F src/pcache.h 4f87acd914cef5016fae3030343540d75f5b85a1877eed1a2a19b9f284248586
  F src/pcache1.c 54881292a9a5db202b2c0ac541c5e3ef9a5e8c4f1c1383adb2601d5499a60e65
@@@ -553,14 -552,14 +553,14 @@@ F src/pragma.h f98354c48571c49092702951
  F src/prepare.c 8f07616db04337057b8498b72d051ee90f73c54615c2e908c05404cef1e060b7
  F src/printf.c 5901672228f305f7d493cbc4e7d76a61a5caecdbc1cd06b1f9ec42ea4265cf8d
  F src/random.c c6e61d041f230d46c658e6dfe7165fc1ecb0093d5fe28cfe74f389d261dc3af8
- F src/resolve.c b9e60afa56d0484ee573aba54d9e73603736236df33d2ae3421b4cd0367d907d
+ F src/resolve.c ae65c88f5d0d4bc0052b203773d407efa2387c2bd6b202f87178006c7bb8632c
  F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
- F src/select.c 586b6adc13c80ef67252bc74b3663ad3af3fce9ae931ac6d1446427da827afdf
- F src/shell.c.in 923671ae56ad899db71296d0ebefea9c85e7e52ef087c8a097f3f3a3a3ade98c
- F src/sqlite.h.in 75f15b721d0f4957b827e902e30551deb1073e3a804e464e17c9087491c147ee
+ F src/select.c 8c2341a9802e0979092d920544823a778f4c2bddf59d323d5e4ed6204ab50550
+ F src/shell.c.in e80fe5118fc3b942c1becc67ebfca6a887dbab9295e0bd5b6da61c4375baa637
 -F src/sqlite.h.in 024a062670b27cd9ff7aeb5f63d341a6d32b95ebf5eff08c13bb07322f3d004a
++F src/sqlite.h.in 64ff3bba7c15f0206235ea9fca797e462ff8f62aa6d077e76680250564383b61
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h e97f4e9b509408fea4c4e9bef5a41608dfac343b4d3c7a990dedde1e19af9510
- F src/sqliteInt.h e6849196441604ecc06e0a6ec70f8f23afb0f3c872ca1cb9409d5500b3d417f9
 -F src/sqliteInt.h e0f023435136c891b95df9ba7462563b960e10c5bff8183728f6ca32f25b7cd4
++F src/sqliteInt.h 292546a65e3969e21e6136b30bd7523b9881e2c8e7e8e324ccee3c0c83312a1b
  F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657
  F src/status.c 4b8bc2a6905163a38b739854a35b826c737333fab5b1f8e03fa7eb9a4799c4c1
  F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
@@@ -625,15 -624,15 +625,15 @@@ F src/trigger.c 3f612ce5f0858b6c23460a3
  F src/update.c 440b9aae32b930fc8c40beff27cdc6060a2fc4c99d911e415f92bb8a4e6eab68
  F src/upsert.c 8789047a8f0a601ea42fa0256d1ba3190c13746b6ba940fe2d25643a7e991937
  F src/utf.c ee39565f0843775cc2c81135751ddd93eceb91a673ea2c57f61c76f288b041a0
- F src/util.c 3f27a1eae01c8bbbb8cdef2f26bd8e6a2a7db08106ef7c3dcc990787a5da6e86
+ F src/util.c 30df8356e231dad33be10bb27897655002668343280004ba28c734489414a167
  F src/vacuum.c a02ce4cb7c45741675bac31528b4bb7b8821727cf3306ade2b06361b4704b248
- F src/vdbe.c 2f5ac2257f05910cb9dc671d7f1419936f5972befe46ea99e76fad97916c7b18
 -F src/vdbe.c 4faf394ea085d18f55881baa97c7c25b2b572fa149ed0bc3170e2d4fc661d1c6
++F src/vdbe.c e0b372a3745f4a12b04bf298724fda2fb852eb9893bd6e61599734a3d42bc1b9
  F src/vdbe.h 25dabb25c7e157b84e59260cfb5b466c3ac103ede9f36f4db371332c47601abe
 -F src/vdbeInt.h 38206c8dd6b60ff03d9fd4f626b1b4fd0eef7cdc44f2fc2c1973b0f932a3f26b
 -F src/vdbeapi.c 7b83468feb1d42a09d4c2e5241a3eaa3d1f138e289a843cba9fd3f1dad95ca67
 +F src/vdbeInt.h 0086b9b03472950687445458219ad99e89b87a0d78631835c708bedba772eff6
- F src/vdbeapi.c af2e512c90e751a4617252d162ad2c56978bd6a6e77ebb269899e1c4333dee59
- F src/vdbeaux.c d27f21b5292f3fa693620396691ed735c20628c85d30dbd8e56b2f3e9dbb6779
- F src/vdbeblob.c 60a7694760e35b2bba166cf49eb6a1eb0b31581102b49de78008ca3032406065
- F src/vdbemem.c 0e830c2aab24241eed85bd4c8a5bd8c9b959081316477440bfffb35089ba7d0b
++F src/vdbeapi.c b67e1ca96672b02586d9eba135d25cc562a831fe2ab3b8cb0bc05ec591941898
+ F src/vdbeaux.c ec21bd1475c69543d961b241b51ad4321342ae1ec1d64969063efbb3db7d23a0
+ F src/vdbeblob.c 292e96c01c4219fca71d74e1002906d43eb232af4bd83f7552a3faec741f3eb8
+ F src/vdbemem.c 8be0af1060012520381d3296fcb1718e80cd5b99ce04f51f7e1c4dba4072caac
  F src/vdbesort.c cd5130f683706c1a43e165a74187745fb3351cb56052cf9dc91de820634bbde2
  F src/vdbetrace.c fe0bc29ebd4e02c8bc5c1945f1d2e6be5927ec12c06d89b03ef2a4def34bf823
  F src/vdbevtab.c f99b275366c5fc5e2d99f734729880994ab9500bdafde7fae3b02d562b9d323c
@@@ -641,12 -640,12 +641,12 @@@ F src/vtab.c d07cc24dd84b0b51bf05adb187
  F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
  F src/wal.c e3a21abbd23d5c8f30fb03e545ba292d3640890968e62ef1604c4ff30c0f043a
  F src/wal.h 7ffe787437f20a098af347011967a6d3bb8e5c3dc645e6be59eff44d2b2c5297
- F src/walker.c 7342becedf3f8a26f9817f08436bdf8b56ad69af83705f6b9320a0ad3092c2ac
- F src/where.c d9215db24449143da844ab86c727bbbef94ad45c53cc17bc0051386472db5789
- F src/whereInt.h 9248161dd004f625ce5d3841ca9b99fed3fc8d61522cf76340fc5217dbe1375b
- F src/wherecode.c ff50e44bb0ce59c55edbf621d5ff0165b8ea001937ce97c6bb9da2278ae00504
- F src/whereexpr.c e5fdac355deef93a821f03b90770f92f2be833e92bbdeff8ac1b6c2ae1f74356
- F src/window.c f27e34e896f84e0bedec32b027d4531f224971ce3e16f8e1d97a968875ddcec1
+ F src/walker.c f890a3298418d7cba3b69b8803594fdc484ea241206a8dfa99db6dd36f8cbb3b
+ F src/where.c ecabef93b0f14442a73eca205fc960428984d75fbdc7d60226b7fc9cac127187
+ F src/whereInt.h 83877a75a1bce056ea44aff02f1dfa958ad1d6038c213ddadb8652003b45151d
 -F src/wherecode.c a1d79cc5a11f44b079bf2352e542ddb265f84cfa6c835d40a9f195dbe5fff83e
++F src/wherecode.c 28e9bba9a1c7ec74eb54e702c7986e5cca4526de8ccf023ffe217cbffc4261d6
+ F src/whereexpr.c 17bdbf4f5b490e70a18635498f0b910a558f953a9bf80af7f19cbde6e60e6825
+ F src/window.c 0dff6fedf61493490d21ced5d7a7b4321d4c0db6c8123f0179c46080a860850a
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
  F test/affinity2.test ce1aafc86e110685b324e9a763eab4f2a73f737842ec3b687bd965867de90627
  F test/affinity3.test eecb0dabee4b7765a8465439d5e99429279ffba23ca74a7eae270a452799f9e7
@@@ -1947,7 -1945,7 +1947,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 25a768cb8a37502c71dcbf728ca6708dd87d6c72bce2eb3a7e84cb0cfda285ad 35ad7bc6e0b31d838a80451300123e160c4a9367a3ea600f01e515a8135563ef
- R 60fde9c0b856809bb7edd16988d95068
 -P 35ad7bc6e0b31d838a80451300123e160c4a9367a3ea600f01e515a8135563ef e162da3ab4c183b67872be004035c48fc8f20084bc5757aec27410ce23a36631
 -R 751941e4c1b7a0c647e10acaaf511c51
++P 71b102942cf46e307b123afbc51be06ebf48af9c364c0e7e0b9763f6963d3fb9 4d972744c3d76254540837f0339731f4e62601cee924320aa3f3c0de7ee97ff3
++R 57dedb97da7bca73ad6b23c9cd8d6e90
  U drh
- Z c6d029d65c4a992f096cfedf17ae12b9
 -Z 0fa6fb424fa4c6aed6eca941cc965041
++Z d911f7872f8482b7e74101eab30b68c8

diff --cc manifest.uuid
index 456b1df6041162e6f5700aa28ee3dc095abda001,0388597a53d346395b9184ba09def28f3d7a693f..7272949fea45f54a5ff358f2c7ff9fc5da3023eb
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 71b102942cf46e307b123afbc51be06ebf48af9c364c0e7e0b9763f6963d3fb9
 -4d972744c3d76254540837f0339731f4e62601cee924320aa3f3c0de7ee97ff3
++0770f320b9c957fec3a73f0859e71f7c9ee2acb1ef150f5cfb67298b1744e8c3

diff --cc src/bitvec.c
Simple merge

diff --cc src/btree.c
Simple merge

diff --cc src/btreeInt.h
Simple merge

diff --cc src/insert.c
Simple merge

diff --cc src/main.c
Simple merge

diff --cc src/pager.c
Simple merge

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

diff --cc src/wherecode.c
Simple merge