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

FossilOrigin-Name: 25a768cb8a37502c71dcbf728ca6708dd87d6c72bce2eb3a7e84cb0cfda285ad

diff --cc manifest
index e8158e62dac7109e2da6c8cc752867dcc36f2bf4,a243702032266e50d725a95c502309de8479ceff..fef9d93844393635a19abf3461bf6bc724b22cbc
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
 -C Merge\srecent\strunk\senhancements\sinto\sthe\sbegin-concurrent-pnu\sbranch.
 -D 2021-08-09T19:33:21.140
 +C Merge\srecent\strunk\senhancements\sinto\sthe\sbegin-concurrent-report\sbranch.
- D 2021-08-03T17:05:35.401
++D 2021-08-09T19:41:48.571
  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 38975b971a4c36dbcc8004c74
  F src/analyze.c abbaaf7dca79d1c31c713500324fc0b55bf3eeac5b7b07001452a3d0f210de4f
  F src/attach.c a514e81758ba7b3a3a0501faf70af6cfc509de8810235db726cfc9f25165e929
  F src/auth.c f4fa91b6a90bbc8e0d0f738aa284551739c9543a367071f55574681e0f24f8cf
 -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 0003bd8a3a04dea14edc0343d37a1a2eeb44b297a2d6d37930417b09a2fbc8f1
 -F src/btree.h 900067641b64d619e6e2a93bd115c952a52f41d3bee32e551e2a4ceee05fc431
 -F src/btreeInt.h 1e9f10107a4ec5d2940ae5b859242ae83b81402986724bed08b8491a5ea64a4d
 +F src/btree.c fc2953cb196793714f7c76ab4618c286e1b2586cdd85d3108421047370843d32
 +F src/btree.h 1c1508834794c0d15fe15d23792cd42deefd8140ad782899eab258d081a0adfc
 +F src/btreeInt.h b8c4dee39e4cbe127a6cf479f32e345e186db63923e937b5f42807c76bfd8e9d
- F src/build.c 71d07b1b5eef2cb4ca3f0eafbb92d9faf56661db6e2dcc3a442f839bcd2c06fe
+ F src/build.c a62affc85047dbba34df74bd938c6d6a8863d024cb2c0e8528c4bef7ae927f31
  F src/callback.c d0b853dd413255d2e337b34545e54d888ea02f20da5ad0e63585b389624c4a6c
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
  F src/ctime.c 8159d5f706551861c18ec6c8f6bdf105e15ea00367f05d9ab65d31a1077facc1
@@@ -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 a09ec15e70ccd680811f1762c9b3f3508897a9c2dcde49054f1e0492069155bd
 -F src/insert.c 4ebff642574d3866316439b3dfce165f80e130e8969853c656d71b2afc5dd73c
++F src/insert.c 0c84e3cea685bcdc8ea8b9941324c776953949650ff1b3e1ddf7bc2540c586cb
  F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
  F src/loadext.c 0aa9e7f08e168e3874cb54984408e3976dafdf5616d511952c425b5ac088ea3e
- F src/main.c 8496edcec37d935e836dfc6e15ab0a549487989ba804f31d74d9e49fbe42eaa6
 -F src/main.c 12ed31f370943d66d313baeb7969a15d8e6085f541ae613c1fbe0635bac5cab2
++F src/main.c f68a1aac3caf70b720689aaddf016ecd2f9ecb1d49cce30fbb5302c3d0277218
  F src/malloc.c cbc93cdd429c4594912017d92ab656e2579aca64dbd1c6888551275bed46f25b
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de
@@@ -550,18 -549,18 +550,18 @@@ F src/printf.c 78fabb49b9ac9a12dd1c89d7
  F src/random.c c6e61d041f230d46c658e6dfe7165fc1ecb0093d5fe28cfe74f389d261dc3af8
  F src/resolve.c 42b94d37a54200707a95566eff4f7e8a380e32d080016b699f23bd79a73a5028
  F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
- F src/select.c c265649aed27697c89fcb9390f872bd39a41d882d4bfe48bbbbcedc4d7de9e95
- F src/shell.c.in 24b99dae8818d1a234732d73f4d5b49f12b510bc62735a41c04e314fafae09e3
+ F src/select.c 7706c492da75ac7cb6b00fd25df254ec450add02708ca43218ea9475ffca8ffd
+ F src/shell.c.in f795a4ae3c35631f5edcfa754c7824ff1d8a75b23a07e22e664b50f82e826346
 -F src/sqlite.h.in 838e545b26809e5b3e7af4ad8ec014a0f5761f3bf531857e001d256f150b9d1a
 +F src/sqlite.h.in ac8e6211a3caaf39645fcde0a2e9139c167653192e078d9c4b6ec94dcc237761
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h e97f4e9b509408fea4c4e9bef5a41608dfac343b4d3c7a990dedde1e19af9510
- F src/sqliteInt.h a898f4971895543557d0cb39e3c05df568d841618da2bf83e5357ab636d862d5
 -F src/sqliteInt.h 89c77974b522e1f336a5bc19e35e474be9144e5861d3760b10ef82b2d9c4d5af
++F src/sqliteInt.h 05f9d4541c22dda96a09754a516b25efd564f710bf64487e0be7ecc9075a2082
  F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657
  F src/status.c 4b8bc2a6905163a38b739854a35b826c737333fab5b1f8e03fa7eb9a4799c4c1
  F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
  F src/tclsqlite.c 05663f6b5010b044eac0ef22fc8fb5ea3406d2502700a898261683258042c88b
- F src/test1.c 460024efcc596adf9a4a860de53806a2ac013532af846e6f978d7c434af27d69
 -F src/test1.c 5d61bf9d984188b64ee7a4346856633ec5555028137f5f3a332bf5ef36c4a0a3
 -F src/test2.c 3efb99ab7f1fc8d154933e02ae1378bac9637da5
++F src/test1.c dd8684a895fe916af31b7142c7ba45e61058ad37b5fed132bd138e0c66589cb8
 +F src/test2.c cb988be1ee1b972dc471e6b076087cfa9cb9ce5c2aa31e98ecf41c3256a72a53
  F src/test3.c 61798bb0d38b915067a8c8e03f5a534b431181f802659a6616f9b4ff7d872644
  F src/test4.c 7c4420e01c577b5c4add2cb03119743b1a357543d347773b9e717195ea967159
  F src/test5.c 328aae2c010c57a9829d255dc099d6899311672d
@@@ -620,13 -619,13 +620,13 @@@ F src/trigger.c 3f612ce5f0858b6c23460a3
  F src/update.c 440b9aae32b930fc8c40beff27cdc6060a2fc4c99d911e415f92bb8a4e6eab68
  F src/upsert.c 8789047a8f0a601ea42fa0256d1ba3190c13746b6ba940fe2d25643a7e991937
  F src/utf.c ee39565f0843775cc2c81135751ddd93eceb91a673ea2c57f61c76f288b041a0
- F src/util.c b18a971c8936e9299fecc00474269a11135989d6fe9bd91b1e52137d6f27bd8c
+ F src/util.c e9fd5c474691a7c913dfc971f01cf6d3a3d5954db04e0764a6426f845505e692
  F src/vacuum.c a02ce4cb7c45741675bac31528b4bb7b8821727cf3306ade2b06361b4704b248
 -F src/vdbe.c d17e7a89b8da8cd72c02c86808ab8b7406d0e9b104c1e793cf0df59744a409d0
 +F src/vdbe.c aa6648a16752c5fe0cb20eb689c83aa4074410e88b3eb96d999040b25ca07be4
  F src/vdbe.h 25dabb25c7e157b84e59260cfb5b466c3ac103ede9f36f4db371332c47601abe
 -F src/vdbeInt.h 38206c8dd6b60ff03d9fd4f626b1b4fd0eef7cdc44f2fc2c1973b0f932a3f26b
 -F src/vdbeapi.c aa5aaf2c37676b83af5724c6cd8207a3064ed46a217fd180957f75ac84f7a2a5
 +F src/vdbeInt.h 0086b9b03472950687445458219ad99e89b87a0d78631835c708bedba772eff6
 +F src/vdbeapi.c af2e512c90e751a4617252d162ad2c56978bd6a6e77ebb269899e1c4333dee59
- F src/vdbeaux.c 6570e0d95dc7489775efa8a7cdccdc3c86a15a00281bda953edc26250009c78d
+ F src/vdbeaux.c d27f21b5292f3fa693620396691ed735c20628c85d30dbd8e56b2f3e9dbb6779
  F src/vdbeblob.c 60a7694760e35b2bba166cf49eb6a1eb0b31581102b49de78008ca3032406065
  F src/vdbemem.c 53881aa0a7845922a075b3f375695588618098871a7a4120af4c297b80fa3e64
  F src/vdbesort.c cd5130f683706c1a43e165a74187745fb3351cb56052cf9dc91de820634bbde2
@@@ -639,7 -638,7 +639,7 @@@ F src/wal.h 7ffe787437f20a098af34701196
  F src/walker.c 7342becedf3f8a26f9817f08436bdf8b56ad69af83705f6b9320a0ad3092c2ac
  F src/where.c 99b6e13664a7bd9a553c554978d0e253066995dade621f44cffa8928c8b493b5
  F src/whereInt.h 9248161dd004f625ce5d3841ca9b99fed3fc8d61522cf76340fc5217dbe1375b
- F src/wherecode.c 401e98037f3ad39051df2c4ac9e3c66ad848b4fe78fdcffa887442de5ca8195a
 -F src/wherecode.c 9b33f463a279feeee69622b747b0050f0b836eb8b5ac48599ba3a6bfbea798a7
++F src/wherecode.c d06ed7509a520a7fe217f59aea5cc357822ae63252fb9ca2060e076ccf690c6b
  F src/whereexpr.c 3a9144a9d52e110efdc012a73b1574e7b2b4df4bf98949387cb620295eba0975
  F src/window.c 420167512050a0dfc0f0115b9f0c7d299da9759c9bb2ae83a61fb8d730a5707f
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
@@@ -1938,7 -1936,7 +1938,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 204dbc15a682125c517150f824d32e0bf1fce1db3daab4db9225a44bded4c50b 2c25f25b22fe8e9c0da8a6ff5f2f117bd1716900c03acc8ed3ee8fce2286e15b
- R 78ce34ec04527a31a4c0573e9c671a99
 -P 2c25f25b22fe8e9c0da8a6ff5f2f117bd1716900c03acc8ed3ee8fce2286e15b d44f74f14a387960ce105913526b572f4a3d1935351c6aab10cee85946488a9e
 -R c7a9f64e7c642ea0d9f63e5a904194e6
++P 385e3b4e9d7245e892f54a4d69fa7a78b1eeb565ae01a6fbabb5b7396ea07d17 514b3cef6b7403cde90dcc926d67355ad6340b79b6a1b06004d97bebfc4eaced
++R 10397bc4853a7ac83b64b1025d76385d
  U drh
- Z 3c70ae9fe6c7295e7dfa5e3d017c0201
 -Z af6588b9e15a00d4124f4cbad636271b
++Z 80258e199b40ef8bf39b69e173f58672

diff --cc manifest.uuid
index fc266c93488cf512ae85016fa3cad0f28dcdcb84,2d3d2d30026aea0b82b122d2596829c6b0f2dc73..47a5b2e51ab23aa84d4a4b8e1cfe623a8448a17d
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 385e3b4e9d7245e892f54a4d69fa7a78b1eeb565ae01a6fbabb5b7396ea07d17
 -514b3cef6b7403cde90dcc926d67355ad6340b79b6a1b06004d97bebfc4eaced
++25a768cb8a37502c71dcbf728ca6708dd87d6c72bce2eb3a7e84cb0cfda285ad

diff --cc src/insert.c
Simple merge

diff --cc src/main.c
Simple merge

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/test1.c
Simple merge

diff --cc src/wherecode.c
Simple merge