Merge recent trunk enhancements into begin-concurrent-report via begin-concurrent...

FossilOrigin-Name: 204dbc15a682125c517150f824d32e0bf1fce1db3daab4db9225a44bded4c50b

diff --cc manifest
index 20bf43c1cda252f31025dfafc5372cb4887d0f5c,0aca5617a1ade9a7641b82a642a649f7d1cb2834..4782edf829b8d1a78b6baf7139573155aef0313b
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Update\sthis\sbranch\swith\slatest\schanges\sfrom\sbegin-concurrent-pnu.
- D 2021-06-14T14:01:25.950
 -C Merge\srecent\strunk\senhancements\sinto\sthe\sbegin-concurrent-pnu\sbranch.
 -D 2021-06-17T17:30:18.523
++C Merge\srecent\strunk\senhancements\sinto\sbegin-concurrent-report\svia\sbegin-concurrent-pnu.
++D 2021-06-17T17:38:13.609
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -488,13 -487,13 +488,13 @@@ F src/alter.c 774a2a175ec747b55046ec62f
  F src/analyze.c 01c6c6765cb4d40b473b71d85535093730770bb186f2f473abac25f07fcdee5c
  F src/attach.c a514e81758ba7b3a3a0501faf70af6cfc509de8810235db726cfc9f25165e929
  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 cebbb6e1a01b46e9f5fad81feb7ea7ca0581737fd866d7b07d6039dc4f00f400
 -F src/btree.h ccdc64bd1eee7ba79d4c0b2af22b6df1e5ededdbf9606f45f4fca4738dd6fa0b
 -F src/btreeInt.h 1e9f10107a4ec5d2940ae5b859242ae83b81402986724bed08b8491a5ea64a4d
 +F src/btree.c 183bb926c8b9be6b6099612f50cc0735e8d4300ea58e08617592210a78101107
 +F src/btree.h 888d9cea384478728e1e475e1660bd4138e3ec635f1b430e3f57e88d9c81d2fe
 +F src/btreeInt.h b8c4dee39e4cbe127a6cf479f32e345e186db63923e937b5f42807c76bfd8e9d
- F src/build.c 7f4bc67cdf0b35126239f5844ea03ddccb857c04abef9018913a2f6edf60d119
+ F src/build.c 22e91195f1fafdde9e181167a983efe859232947bf40f173e1b82f02c6ad21a0
  F src/callback.c d0b853dd413255d2e337b34545e54d888ea02f20da5ad0e63585b389624c4a6c
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
  F src/ctime.c 3052b6b05ed9ef547a3dd66b8e01bfa9d582e78752ad6ed327da84652641e038
@@@ -511,10 -510,10 +511,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 2189e0e596010a0dc5405d9f14f78db1ee2fa71138c931f5b6ea96610b95bfc1
 +F src/insert.c 7c7ef7b00c58443b5a3832eb4a963377fa9216682d992d5bc96310fb00625496
  F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
  F src/loadext.c 12684b3f19cd103cea97cdf14d0758196d0c646e12a898d7245141a9abfde9a4
- F src/main.c 1989d087d08f267eddab38db6b8a302717c50e597ff0f9adc29dadef03097970
 -F src/main.c 76dc97dd9879a73dd88a8b523e117b570748a67fb1c146258bfc24829299061d
++F src/main.c 73ef695cbb6d7d52603dad58129e1901df70e632fc47df996cb034729cc2e0cc
  F src/malloc.c cbc93cdd429c4594912017d92ab656e2579aca64dbd1c6888551275bed46f25b
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de
@@@ -534,11 -533,11 +534,11 @@@ F src/os.c 59ed1f503347e8b5434c0ce7d7d0
  F src/os.h 26890f540b475598cd9881dcc68931377b8d429d3ea3e2eeb64470cde64199f8
  F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
  F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586
- F src/os_unix.c ff4738e222bbbc2ecc396398c8ba1ae757bee03b782a8dd8bc8a5d39128e52d1
+ F src/os_unix.c 5d4a80fe497e48d87078e67ea88e9e44cd714dc02b9f1f20f40831883f81411d
  F src/os_win.c 77d39873836f1831a9b0b91894fec45ab0e9ca8e067dc8c549e1d1eca1566fe9
  F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
 -F src/pager.c 12b7e6f061247cc7e24d81dddd0161ba9e317ef3c3b93f0a299873746a07d989
 -F src/pager.h fdc30693c403aa9b4293d0b126346db7e450f8f0e5d2c1bb8355acb1cb8da6fd
 +F src/pager.c 8302eb7aab26c8f0120c714d5f0505ba41140790b76fc62ff8163ca00b7122d7
 +F src/pager.h ed1f7bc91ceae75fa918d51f7c2ad071a5458cc3dc0085ca7577f8d51bf2d7cb
  F src/parse.y a52d0c9a7485121232ecbfcd2086e9f9ddf12449c9fa38fda9be4932e402e3c3
  F src/pcache.c 385ff064bca69789d199a98e2169445dc16e4291fa807babd61d4890c3b34177
  F src/pcache.h 4f87acd914cef5016fae3030343540d75f5b85a1877eed1a2a19b9f284248586
@@@ -547,15 -546,15 +547,15 @@@ F src/pragma.c eb42cb9bec189cf18cef5d8f
  F src/pragma.h b93fd693bd38cefeaf8e2c7e8c929717f7799a9770104cdd2bae8df2a84e2da7
  F src/prepare.c 0d53d20532aada295c1690792a125adbd6435f5ce703ff0adf1b9b3605238b67
  F src/printf.c 78fabb49b9ac9a12dd1c89d744abdc9b67fd3205e62967e158f78b965a29ec4b
- F src/random.c f27af4099afaea7284ade5c206224dcfdb2334cfd119d018b470d46356b3f27d
+ F src/random.c c6e61d041f230d46c658e6dfe7165fc1ecb0093d5fe28cfe74f389d261dc3af8
  F src/resolve.c 35630effd4d16d2373caa41bae40a3d71f853f3ad0cb4f572f2ed4b8c350c1e9
  F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
- F src/select.c c586ad02fe8813acf907f5cab181993839ba2fbfc87ac72392d1605401cb6203
- F src/shell.c.in 586493be0d3a2fc1e6803577d683697dfefc0fb305cc966bb389ce4045cbc19d
- F src/sqlite.h.in 38d1b16b820d6323b6509099ac80211ff0c87c3e05ef39f18621100f9a646182
+ F src/select.c 3e7dcf9289592d1a3f73a3a1d480afe460df21c921c63665f71cffb21d91a62f
+ F src/shell.c.in f3e91c697f33daae14923355dcadfc26bb0c1eabdb343e5508706893e017a0a6
 -F src/sqlite.h.in 7c316672fab387f00b9bbc086dac23ca302904db453c48b33683c2835e5bb9aa
++F src/sqlite.h.in 50379147536f54ed2c366eafe651ff3d6ea48a00bc7c1f26cfadc8aaedefac3e
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h 61b38c073d5e1e96a3d45271b257aef27d0d13da2bea5347692ae579475cd95e
- F src/sqliteInt.h 31376e9d1e53dcb27f11188116d63a623447e379ba2843b7083ca854e90e9ffe
 -F src/sqliteInt.h ad3ffc57e6980b4e3a8a3642699f69858dc7aec87051e7c680125be8a98ac0cd
++F src/sqliteInt.h 154e4306489e1e88542106459e9a31f690cf00dbea3f439862cc1d2fa18b1829
  F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657
  F src/status.c 4b8bc2a6905163a38b739854a35b826c737333fab5b1f8e03fa7eb9a4799c4c1
  F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
@@@ -637,9 -636,9 +637,9 @@@ F src/vxworks.h d2988f4e5a61a4dfe82c652
  F src/wal.c 59ad6d70c32f6e52d9695b081a429b5c2ed76b116bee5dcfed88d3e78148164a
  F src/wal.h 7ffe787437f20a098af347011967a6d3bb8e5c3dc645e6be59eff44d2b2c5297
  F src/walker.c 7342becedf3f8a26f9817f08436bdf8b56ad69af83705f6b9320a0ad3092c2ac
- F src/where.c dc062832c30aa6c5f17805c1235b2b621cd9db506412d5d3ef0799d26ae3396f
+ F src/where.c 4caf843825c6292440113258fefaa6f747fd570c6915628957e42e39529988f5
  F src/whereInt.h 9248161dd004f625ce5d3841ca9b99fed3fc8d61522cf76340fc5217dbe1375b
 -F src/wherecode.c 9f1f65d11437b25cd0a1497a170514c785f19ce6ad9d3e6fc73719cb5a49012f
 +F src/wherecode.c 116a1964eda2d6489186d7a2de8c34e38a868c488dfb987c1e4d3a9ee3a2f233
  F src/whereexpr.c 5a9c9f5d2dac4bcdcaae3035034b4667523f731df228e0bb1d4efc669efa9da5
  F src/window.c a6d624d83b2d5b3cfb82bb437a2fbae759c928d47dc9ad1338a9419269181bb2
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
@@@ -1936,7 -1934,7 +1936,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 1dc6cf51138bd16c1e291f3ddb0fa00fd35fbb087de54e0b4c4afd5dd52da62c 74b42754d075a91e8f7d9067a3fcd5c60af03b520984fb3f8bb0c51faa376857
- R a8e75f3ad6448a5a493cbf3278b1e727
- U dan
- Z 0c18bed414912783ac1fa2f2454355b7
 -P 74b42754d075a91e8f7d9067a3fcd5c60af03b520984fb3f8bb0c51faa376857 7bd55eee1ac63cf6d5699ce85bc5a29bf51afdf7a80bce44937fa833947a40f4
 -R 8eaf4abc566f25b74e97a4612dd9d586
++P a485d1a1b8a6a8255cd5177b6a8fa375e1b7281030170152819d5ee85b2b2334 229107b196abe5ab458ce84361d4b1e40d9d077effab7ebe9caac475fb96f7c0
++R 206c3ba8474a1bfbf5ec7772c623eca7
+ U drh
 -Z 967009a0594e02627d0855e7383ca875
++Z a69058283890e0aafc2df3edd6548f93

diff --cc manifest.uuid
index d862503391caf0bcbcf5927a27e7557e35f129ed,0e133ce5f235ee49806bd6a1b95d66d892e0a172..1da213fae1180b61bf9042d9c353e248eb714b92
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- a485d1a1b8a6a8255cd5177b6a8fa375e1b7281030170152819d5ee85b2b2334
 -229107b196abe5ab458ce84361d4b1e40d9d077effab7ebe9caac475fb96f7c0
++204dbc15a682125c517150f824d32e0bf1fce1db3daab4db9225a44bded4c50b

diff --cc src/main.c
Simple merge

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

diff --cc src/sqliteInt.h
Simple merge