Merge the latest trunk enhancements into the begin-concurrent-report branch.

FossilOrigin-Name: ddc11f55990bf20246732dfe2c7e00cdd9bf7c8ebb2983ed49ca355382b4112d

diff --cc manifest
index 18dd57e34a11d6123d153fc3d962ca811355e7e9,ac57cebfb4fd06a3451fa5befb8e76fde0da647a..2dd23a0a9cd799377fafdc53fc2398cbd8b111e0
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\sall\srecent\strunk\schanges\sinto\sthe\sbegin-concurrent-report\sbranch.
- D 2021-11-09T15:36:07.468
 -C Merge\sthe\slatest\strunk\senhancements\sinto\sthe\sbegin-concurrent-pnu\sbranch.
 -D 2021-11-22T16:27:23.390
++C Merge\sthe\slatest\strunk\senhancements\sinto\sthe\sbegin-concurrent-report\sbranch.
++D 2021-11-22T16:39:01.387
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -494,12 -493,12 +494,12 @@@ F src/alter.c 23743384e59f9d36df870ce41
  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 e67e4ebed581b5f0aa9155abd88177ed8b63eb40e9266b1483ce7f6eb9257477
  F src/btmutex.c 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6
- F src/btree.c 1ad1fb5b87440ff7515de0d762f0353e2989bdf5872052f03f3f2143965b21dd
 -F src/btree.c 83f2ea858ad99c050030a207390c953337912ab9c5649ff18283c3c6224702d6
 -F src/btree.h 900067641b64d619e6e2a93bd115c952a52f41d3bee32e551e2a4ceee05fc431
 -F src/btreeInt.h 3f19f0be5af0b68cff55e58df4b11e7a0692d9e8a820ceaeba4084659a86cf28
++F src/btree.c 0bd2611eaacd026cd3634735ccee7847a1f21ff8a966cbc53314570d16ea5d9d
 +F src/btree.h 1c1508834794c0d15fe15d23792cd42deefd8140ad782899eab258d081a0adfc
 +F src/btreeInt.h 614e75ff0bfdd26f4270ba178cd5a41f904aee7be203612fbe7fc2215fc83d9c
  F src/build.c ee4b4aefda097c1220ae5ce615bdfbb05ed50d3015e72c5af335fb66fc08af37
  F src/callback.c 106b585da1edd57d75fa579d823a5218e0bf37f191dbf7417eeb4a8a9a267dbc
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
@@@ -517,10 -516,10 +517,10 @@@ F src/hash.c 8d7dda241d0ebdafb6ffdeda31
  F src/hash.h 3340ab6e1d13e725571d7cee6d3e3135f0779a7d8e76a9ce0a85971fa3953c51
  F src/hwtime.h cb1d7e3e1ed94b7aa6fde95ae2c2daccc3df826be26fc9ed7fd90d1750ae6144
  F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
 -F src/insert.c 7fcbbe9114ac402ea3c0c6a3810f13fc89cae8131ea1659ec472be7caac10192
 +F src/insert.c 5a9373456f86b024588e36169cfd151a58a42b8a77e4701e8c40fff766dcce92
  F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
  F src/loadext.c e1dcff1c916bf6834e150b492eddda5d9792453182d2ad64294d2266b6e93c4c
- F src/main.c bd7befda8fde5f4b1fda67e0ef6c1db4b2a311c195a7cc5ac39405163a950c67
 -F src/main.c 6144b8771876e5717a81a1b7599e610e57971d5fd925ff53888f6bd22712ca4a
++F src/main.c 6e7cc750c236baf1cc0001965bbb564c79be9b41989726925549a3ccee545164
  F src/malloc.c ef796bcc0e81d845d59a469f1cf235056caf9024172fd524e32136e65593647b
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de
@@@ -540,11 -539,11 +540,11 @@@ F src/os.c b1c4f2d485961e9a5b6b648c3668
  F src/os.h 26890f540b475598cd9881dcc68931377b8d429d3ea3e2eeb64470cde64199f8
  F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
  F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586
- F src/os_unix.c 4dbcb8290f2d63eca7a973aa63dfe68951bbdf48f4301f8207d5e960800f7067
+ F src/os_unix.c d6815223d2a91a63b34d240a98f51341e74f8aabd3f8391fb3131c0ab1bd4b1e
  F src/os_win.c 77d39873836f1831a9b0b91894fec45ab0e9ca8e067dc8c549e1d1eca1566fe9
  F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
 -F src/pager.c 90941a31d2061a012064cedf5435a5001d8e5d5e4dda0103ba3d650a9ea1c662
 -F src/pager.h fdc30693c403aa9b4293d0b126346db7e450f8f0e5d2c1bb8355acb1cb8da6fd
 +F src/pager.c 78641f572ace87aaa3ef3fac00a8f45fc476af27c72329442a2705fdd5d870aa
 +F src/pager.h ed1f7bc91ceae75fa918d51f7c2ad071a5458cc3dc0085ca7577f8d51bf2d7cb
  F src/parse.y 59631359574901cc5cd4780939a6740f6bc597bd473334e744c1a1c32d9adef3
  F src/pcache.c 084e638432c610f95aea72b8509f0845d2791293f39d1b82f0c0a7e089c3bb6b
  F src/pcache.h 4f87acd914cef5016fae3030343540d75f5b85a1877eed1a2a19b9f284248586
@@@ -556,18 -555,18 +556,18 @@@ F src/printf.c 5901672228f305f7d493cbc4
  F src/random.c c6e61d041f230d46c658e6dfe7165fc1ecb0093d5fe28cfe74f389d261dc3af8
  F src/resolve.c 4a1db4aadd802683db40ca2dbbb268187bd195f10cbdb7206dbd8ac988795571
  F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
- F src/select.c 1f188fd3aa15d8cb5e5397b8ba91102b3b9b2803cc50e5df770929aa82a34a1c
- F src/shell.c.in f8854bcb0d14707d661732698d5210d7f01694000c46e8014b323ad18f575be6
+ F src/select.c 9e70ca5f5836527faaf62f8cce5429f9096ad593606be297eaabcb4c4f0ef057
+ F src/shell.c.in 975f268ef261773fcbed1e519dfa10c4f33e8b1cffc12120563e61857fff07c6
 -F src/sqlite.h.in 32f7d112cb85d3f2fd56500e11a6bd6d19a969306650200dcde97c2638cfecfc
 +F src/sqlite.h.in 5c7c193579e84dde8b0f2a9842170e7ecc74ecadfd26503a66873edacbb5114c
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h 8ff2fd2c166150b2e48639f5e506fb44e29f1a3f65031710b9e89d1c126ac839
- F src/sqliteInt.h f496dc905c2a702835747710a756a937c1c84cfc06cd07cd4f51b0c055ee27e3
 -F src/sqliteInt.h de78ebbe54eaa50de7ef14f7599944d28797a9f5fcd7f4d3c6aebc61ae328459
++F src/sqliteInt.h 2def09c82b66ab93cbdcb0828a23bc689a8e36128c36adc5c67c06f49e21a49b
  F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657
  F src/status.c 4b8bc2a6905163a38b739854a35b826c737333fab5b1f8e03fa7eb9a4799c4c1
  F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
- F src/tclsqlite.c 428e813dabf82804bc13196af35a0c3c6ef4347fe557fa6717c5c66bba6e8520
+ F src/tclsqlite.c 50c2b759f4a918e41ed7a038baaef087ff264c7b3adddf39741315a53fd92e47
 -F src/test1.c 2785b6fd05e4810f7215bf8de01c15670f39a19e49e3d927045f5e72ab08b4cd
 -F src/test2.c 3efb99ab7f1fc8d154933e02ae1378bac9637da5
 +F src/test1.c 1ab25d4bd0133cd4d6a182118dad8bb3fa5724c23596216febb370c164e8ec23
 +F src/test2.c cb988be1ee1b972dc471e6b076087cfa9cb9ce5c2aa31e98ecf41c3256a72a53
  F src/test3.c 61798bb0d38b915067a8c8e03f5a534b431181f802659a6616f9b4ff7d872644
  F src/test4.c 7c4420e01c577b5c4add2cb03119743b1a357543d347773b9e717195ea967159
  F src/test5.c 328aae2c010c57a9829d255dc099d6899311672d
@@@ -628,12 -627,12 +628,12 @@@ F src/upsert.c 8789047a8f0a601ea42fa025
  F src/utf.c ee39565f0843775cc2c81135751ddd93eceb91a673ea2c57f61c76f288b041a0
  F src/util.c 30df8356e231dad33be10bb27897655002668343280004ba28c734489414a167
  F src/vacuum.c 72867c740476d13f1c397015e4d3168b4e96a237a80b9afa67e1bb8500bfeeab
- F src/vdbe.c 4f1ea2cbbb4f0ce1cc27a3afaf7bd3f11526510e5ad58d837d3a8b5525b125bf
 -F src/vdbe.c c019c274ccdbafabbb97fce197b811f9664dcdc7c00a56a6ee078d675ffe78f7
++F src/vdbe.c 9cc0092e0fb995f7aa7c7ce67315f875b063c526c3a6a76b14991270e68ea879
  F src/vdbe.h 25dabb25c7e157b84e59260cfb5b466c3ac103ede9f36f4db371332c47601abe
 -F src/vdbeInt.h 31fbabdc1ed61d9695337dfe5269ea94e1cf615c17f5cafeaa1bb01066820bab
 -F src/vdbeapi.c 22c79072ae7d8a01e9bcae8ba16e918d60d202eaa9553b5fda38f99f7464d99a
 +F src/vdbeInt.h 2f0878748f6cea86736ea3e035266afd54439303645fe62a7c21f40fee95e424
- F src/vdbeapi.c b302a21521c33e10efee0fffd6e1381145f1c7e1af17a478d9df58600295869e
- F src/vdbeaux.c ec21bd1475c69543d961b241b51ad4321342ae1ec1d64969063efbb3db7d23a0
- F src/vdbeblob.c 292e96c01c4219fca71d74e1002906d43eb232af4bd83f7552a3faec741f3eb8
++F src/vdbeapi.c fefd3a5a9029b03183d83f609c746098611240816002ce480a01ea1286184f21
+ F src/vdbeaux.c 60377ffca1a1c963e2f704910b1441ee518f56e735f966560d6c420979934547
+ F src/vdbeblob.c 29c4118f7ee615cdee829e8401f6ead1b96b95d545b4de0042f6de39c962c652
  F src/vdbemem.c a3d91dc9bb9ef725db77e4e9de7e1acef43192c9f8406c307665d503e3c2837c
  F src/vdbesort.c 513b481c8bab4a6578c92194a60cf3bc3b48736e4a53f8d2d7918121c5b594e7
  F src/vdbetrace.c fe0bc29ebd4e02c8bc5c1945f1d2e6be5927ec12c06d89b03ef2a4def34bf823
@@@ -1950,7 -1949,7 +1951,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 0770f320b9c957fec3a73f0859e71f7c9ee2acb1ef150f5cfb67298b1744e8c3 b9802d0b479ee910b7f50ea7995776040ec183ecbdc44fc00086154fb819ef12
- R ca1e7a4fa7e40b1c7fb634a57857265e
 -P b9802d0b479ee910b7f50ea7995776040ec183ecbdc44fc00086154fb819ef12 0f567b61072e214c40cae1441889f83622a975f429b41803dfbed687718731c8
 -R d2db7a7f46a149a84dfb81e1b1d5d335
++P 122f4a762ab1812f423e57c0630602de48ebf58bc0ff166bd08822dbdd15c5e2 aa045e7b09ee47fb281579178add904fffc2299b05cfc67cf872ec3caaffd69b
++R fd3ba16a77989d9fd4ae507bdf4b1b1e
  U drh
- Z 5b7d665173371bf925f7720f418abb9e
 -Z 4ac3fdad7b6daeb2f5034d60a0122960
++Z 5c5104f29b1dda751bc71bae564f3196

diff --cc manifest.uuid
index 92cfbf74d8b2540b0f7ab49dc2b898f0a20fa3f9,3bec62a6aba1efe830c765b0a916941bd23cdb61..a70ec2e56245e8d05a32cd6b04bef5dcb695f12d
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 122f4a762ab1812f423e57c0630602de48ebf58bc0ff166bd08822dbdd15c5e2
 -aa045e7b09ee47fb281579178add904fffc2299b05cfc67cf872ec3caaffd69b
++ddc11f55990bf20246732dfe2c7e00cdd9bf7c8ebb2983ed49ca355382b4112d

diff --cc src/btree.c
Simple merge

diff --cc src/main.c
Simple merge

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc src/vdbeapi.c
Simple merge