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

FossilOrigin-Name: 42e6d842abc4adf8b7f4d245fabaf06badd535a54399d1214872e97d82e8c915

diff --cc manifest
index bbd9dcf081f8d6e62bfdf569fbc365608780b74b,e8286f60126cf1f312d22e57ccd6dcc63cfe099a..f5b733c5b927f05476c4422cee65b418b053ff65
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Bring\sthe\sbegin-concurrent-report\sbranch\sup\sto\sdate\swith\sall\sthe\slatest\ntrunk\senhancements.
- D 2022-01-17T19:24:10.507
 -C Merge\sthe\slatest\strunk\senhancements\sinto\sthe\sbegin-concurrent\sbranch.
 -D 2022-01-25T15:20:16.510
++C Merge\sthe\slatest\strunk\senhancements\sinto\sthe\sbegin-concurrent-report\sbranch.
++D 2022-01-25T15:48:29.294
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -490,17 -490,17 +491,17 @@@ F spec.template 86a4a43b99ebb3e75e6b9a7
  F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b
  F sqlite3.1 fc7ad8990fc8409983309bb80de8c811a7506786
  F sqlite3.pc.in 48fed132e7cb71ab676105d2a4dc77127d8c1f3a
- F src/alter.c 67ef8e685f547038b7ad93a7c6571f790d0a5bb1c00632d5466ffb4ccf3ee6e8
+ F src/alter.c e8ac1df663bf4ec74920edd1299435f2a616d2404de0ac4013c151ea4e7a11f2
  F src/analyze.c 7518b99e07c5494111fe3bd867f28f804b6c5c1ad0703ec3d116de9bab3fa516
- F src/attach.c e3f9d9a2a4a844750f3f348f37afb244535f21382cbfcd840152cb21cb41cfaf
+ F src/attach.c f26d400f3ffe2cdca01406bca70e5f58c5488bf165b4fc37c228136dfcf1b583
  F src/auth.c f4fa91b6a90bbc8e0d0f738aa284551739c9543a367071f55574681e0f24f8cf
- F src/backup.c 0d3f5004d5c85f257add00aee97687d40790a471a5d56306043ed9a7b53d6994
 -F src/backup.c 58880b9a9adf88f1a57cb3b0db6b891626ae76113ebd0f2417a87c2634edfc65
 -F src/bitvec.c 3907fcbe8a0c8c2db58d97087d15cdabbf2842adb9125df9ab9ff87d3db16775
++F src/backup.c d2ce92803ca7bec50783b3d79bff61c9928c087498a651fbc89a7738ebaaa3f1
 +F src/bitvec.c e67e4ebed581b5f0aa9155abd88177ed8b63eb40e9266b1483ce7f6eb9257477
  F src/btmutex.c 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6
 -F src/btree.c bdcf1b01f61807ea66e40c8259235ba6d865f23daea05b9e6eeb22343befe941
 -F src/btree.h 900067641b64d619e6e2a93bd115c952a52f41d3bee32e551e2a4ceee05fc431
 -F src/btreeInt.h 3f19f0be5af0b68cff55e58df4b11e7a0692d9e8a820ceaeba4084659a86cf28
 +F src/btree.c f037ec5624182eef1aec337bd2f7183c69468623c0c84357bb1ae954fe13edec
 +F src/btree.h 1c1508834794c0d15fe15d23792cd42deefd8140ad782899eab258d081a0adfc
 +F src/btreeInt.h 614e75ff0bfdd26f4270ba178cd5a41f904aee7be203612fbe7fc2215fc83d9c
- F src/build.c dd307f67825513716a4c9638ef83f2c66ff4b3d21b897b068a2c275b8f2a3ec7
+ F src/build.c d62a68c0bcefc4a1154e3f44424b3c3c74699c6a30fb9535e2cbedb9c376a9ff
  F src/callback.c 4c19af69835787bfe790ac560f3071a824eb629f34e41f97b52ce5235c77de1c
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
  F src/ctime.c 2cce39df1a13e05b7633e6d21b651f21492471f991dd7b323a4ee4e7b7f0b7f1
@@@ -517,12 -517,12 +518,12 @@@ 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 ec858fa962a0b88428ca8dc1d2cab34e488062cc2720b047366164dea7927cbd
- F src/json.c 78fdec9af3a8bfb5ae685707b2701276fec1942b8f5f26689b2701debe32bcd2 w ext/misc/json1.c
 -F src/insert.c 1eea44389de3768ac98588c1410171cd53e7c6ad1af74049983dcbac82093de0
++F src/insert.c 9b99840ef8ec4d2656a089dcb695d45b9f29a648a352686df9c99f91dceee539
+ F src/json.c 78fdec9af3a8bfb5ae685707b2701276fec1942b8f5f26689b2701debe32bcd2
  F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
- F src/loadext.c 95db1fe62c5973f1c5d9c53f6083e21a73ece14cdd47eeca0639691332e85c4d
+ F src/loadext.c 657534339585ac234839e5187aa51d8802f292e0771c4f874b3af1f1223f81e2
 -F src/main.c 4806307e415189bbf91df6467d6ff923643fdeb84e782ef0d5451a14465db935
 +F src/main.c 6cf0b4988559702601967e4df335dd497df866b7ddbcf3a60d1de2ebdf040017
- F src/malloc.c ef796bcc0e81d845d59a469f1cf235056caf9024172fd524e32136e65593647b
+ F src/malloc.c fec841aa0a0400a6f7d20706178a5d8e8219a6bf562b6fe712c17f6c26813266
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de
  F src/mem2.c c8bfc9446fd0798bddd495eb5d9dbafa7d4b7287d8c22d50a83ac9daa26d8a75
@@@ -550,25 -550,25 +551,25 @@@ F src/parse.y c7c307018e6d328523833cf7e
  F src/pcache.c 084e638432c610f95aea72b8509f0845d2791293f39d1b82f0c0a7e089c3bb6b
  F src/pcache.h 4f87acd914cef5016fae3030343540d75f5b85a1877eed1a2a19b9f284248586
  F src/pcache1.c 54881292a9a5db202b2c0ac541c5e3ef9a5e8c4f1c1383adb2601d5499a60e65
- F src/pragma.c c536665ce8431c8b1efbf7e0a5c01852f49f7bf28f1954f8118b2d28e4a3797f
+ F src/pragma.c 7c024d690a3dc93f61830f11f900e4af2357f31d081b0c79099ca5e28919cba7
  F src/pragma.h f98354c48571c490927029510566839bf9e7242569bfbb48032dafeb008481d2
- F src/prepare.c 45fe7408eb78d80eca8392669070a6e5caf231b09e5c7b1ff65c1ad64a3734c5
+ F src/prepare.c 1e23522c934d90ff42de1b9b4f782fdf0fb690b06b92d7480b471ccb2b5899ea
  F src/printf.c 975f1f5417f2526365b6e6d7f22332e3e11806dad844701d92846292b654ba9a
  F src/random.c d4127b3d8ba155e293cc1abb19f70992c147abd5cc911df25582cb481b705974
- F src/resolve.c 359bc0e445d427583d2ab6110433a5dc777f64a0ecdf8d24826d8b475233ead9
+ F src/resolve.c 24032ae57aec10df2f3fa2e20be0aae7d256bc704124b76c52d763440c7c0fe9
  F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
- F src/select.c df53cc54f99fbfc3807c1a3d9ee238301069f49b482ffe6d7b42d24371354d75
- F src/shell.c.in f78c0b1d6b4d362604ad2f31e602ee967c234ea9975e7143044cf5a7df207b3c
- F src/sqlite.h.in d3911648f7d5b220fa2024d4edce0ed49f780b3283130e0f49f35eec3fb7a740
+ F src/select.c 760d9f28dbeaafef9ea54c509af94ff5695df73ad5c854efd53de32a0564ed56
+ F src/shell.c.in 4ccfb3b7f38756d11d9a31f78ba1339edda8e89f616e8c67046939c87bd14ace
 -F src/sqlite.h.in d54bb1cc5e5cfb577c7e188813a06b785299121c6f5822a3770f22da3245ce33
++F src/sqlite.h.in f3be5ed6f7a9917dac2974368b642717518a0895112494129bb4ec49968790e9
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
- F src/sqlite3ext.h 01eb85e4f2759a5ee79c183f4b2877889d4ffdc49d27ae74529c9579e3c8c0ef
- F src/sqliteInt.h 1cc6e31816d7f17d12e70f07cd77b0730fdd531cf63dfe067d1299cd031473a3
+ F src/sqlite3ext.h 5d54cf13d3406d8eb65d921a0d3c349de6126b732e695e79ecd4830ce86b4f8a
 -F src/sqliteInt.h c142e938cebd7dab169f2a760c2d79803ae1015e680d8f66a73d182387836b7c
++F src/sqliteInt.h 73e412061da69ac36a8a22c9d83c3722daf3b0a0d8a8c53d249f3f6a236ebb65
  F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657
  F src/status.c 4b8bc2a6905163a38b739854a35b826c737333fab5b1f8e03fa7eb9a4799c4c1
  F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
  F src/tclsqlite.c 48f291e1a7e672a7204884d4c164a8ed3a522ff087c361ada2991f5d54e987f6
- F src/test1.c 059233056818556b61ddb819acc4c2673781731d687de98422af145238b0997f
 -F src/test1.c 5d39b01f7ce4c0d50e1e83c574e1693de2e88036aa298bc156a03b7d388f6ca1
 -F src/test2.c 3efb99ab7f1fc8d154933e02ae1378bac9637da5
++F src/test1.c 1450f34c228aa7d2e2c6f67790c0c33d93d7a650225550b5add8b7a894fcd287
 +F src/test2.c cb988be1ee1b972dc471e6b076087cfa9cb9ce5c2aa31e98ecf41c3256a72a53
  F src/test3.c 61798bb0d38b915067a8c8e03f5a534b431181f802659a6616f9b4ff7d872644
  F src/test4.c 7c4420e01c577b5c4add2cb03119743b1a357543d347773b9e717195ea967159
  F src/test5.c 328aae2c010c57a9829d255dc099d6899311672d
@@@ -623,32 -623,32 +624,32 @@@ F src/test_wsd.c 41cadfd9d97fe8e3e4e44f
  F src/threads.c 4ae07fa022a3dc7c5beb373cf744a85d3c5c6c3c
  F src/tokenize.c b74d878aa7c82ec8460779468061a96185e22257f68ab785b69abce354b70446
  F src/treeview.c 9dfdb7ff7f6645d0a6458dbdf4ffac041c071c4533a6db8bb6e502b979ac67bc
- F src/trigger.c 40e7c3dcff57a770d5fa38ba21ed4725572fd2e224c58af61eb980598b60f9c8
- F src/update.c bf714a1f1bfe5138eb21d96e9fa52d2a6831756c9162c3782f976575ba1ecbea
+ F src/trigger.c 692972e4393dfc8017a1a527c1ea1b96ce3d101e84584cd832fcfb83d22b50b2
+ F src/update.c 1f3a7bda1c7489b64e9b9392d829b6a2d4ffb6d2b97152cb2b3d05f0c016b3d4
  F src/upsert.c 8789047a8f0a601ea42fa0256d1ba3190c13746b6ba940fe2d25643a7e991937
  F src/utf.c ee39565f0843775cc2c81135751ddd93eceb91a673ea2c57f61c76f288b041a0
- F src/util.c 89e51820bcb468ff3877a8d942f5cc807208087f021227e0927693e928a195bc
+ F src/util.c 602fe229f32a96ceccae4f40824129669582096f7c355f53dbac156c9fecef23
  F src/vacuum.c 72867c740476d13f1c397015e4d3168b4e96a237a80b9afa67e1bb8500bfeeab
- F src/vdbe.c 8746410d5b2381d713a86d52339f10cf7534bc64c05f2b2ad7ff7a9d3ae50069
 -F src/vdbe.c d2f53c56dabf175bf229dfd65b7fd53815e4a8e6e4c4766252afdfc7c84fb8d1
++F src/vdbe.c 80935b36828265eda68c3a9bb64cb9a83413bcc275d383b55725b5f796869d4f
  F src/vdbe.h 25dabb25c7e157b84e59260cfb5b466c3ac103ede9f36f4db371332c47601abe
 -F src/vdbeInt.h d89d5d2150500cfb08615329fd20aea9d746bba5f2c3ecb8a17e2d2d9be029e5
 -F src/vdbeapi.c 22c79072ae7d8a01e9bcae8ba16e918d60d202eaa9553b5fda38f99f7464d99a
 +F src/vdbeInt.h a27ec79d89988f9e12f2830cfa38dfca89e19eda4e31906f520b86b6ab87e0df
 +F src/vdbeapi.c fefd3a5a9029b03183d83f609c746098611240816002ce480a01ea1286184f21
- F src/vdbeaux.c 00fc867d51b1080550784c0a2c49abca472c73d2bb53767e8199299eb582cbca
- F src/vdbeblob.c 29c4118f7ee615cdee829e8401f6ead1b96b95d545b4de0042f6de39c962c652
+ F src/vdbeaux.c 312d57e71e6e152243867390308aec667e05a4e7e676a674114a33f6687d3702
+ F src/vdbeblob.c 5e61ce31aca17db8fb60395407457a8c1c7fb471dde405e0cd675974611dcfcd
  F src/vdbemem.c da4d594084d581be6436582bb44bb128feeb138a3e6c313eda6749ebdc3a65ec
  F src/vdbesort.c 43756031ca7430f7aec3ef904824a7883c4ede783e51f280d99b9b65c0796e35
  F src/vdbetrace.c fe0bc29ebd4e02c8bc5c1945f1d2e6be5927ec12c06d89b03ef2a4def34bf823
  F src/vdbevtab.c f99b275366c5fc5e2d99f734729880994ab9500bdafde7fae3b02d562b9d323c
- F src/vtab.c a47cc12ebaa350800c0c87b6b0095debbb5a6ed32727bcab9d82ad070a81b738
+ F src/vtab.c e0eaf5b8f7f8929088485a76bea2ff6124adb12e0eb5c0997287ff5e0e4c0517
  F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
- F src/wal.c 80c323b66657ff8edffb10ab231990bc999fff098c6cff9982a1b5fa1739a93b
+ F src/wal.c 419c0a98dd65b9419fd07bdd4f9facc61143c33d57b0dbeffd83cf38a2e0e33e
  F src/wal.h 7ffe787437f20a098af347011967a6d3bb8e5c3dc645e6be59eff44d2b2c5297
  F src/walker.c f890a3298418d7cba3b69b8803594fdc484ea241206a8dfa99db6dd36f8cbb3b
- F src/where.c eedf0311d59095bcd8523bd13bf25865e1caf1fab9beddbff9093340a1a409c7
- F src/whereInt.h 91865afa4a3540bb3bd643619acc56fbceff7defeb8f249b8e157fd5325d88be
- F src/wherecode.c 662ce5ebdf6890afa74d502546f297b51aefdf66f344365e0601f5652ae59c4c
+ F src/where.c a14990c7b35e95f8f9cb0dc0d6d2e32fa99135a716a04027cefa48138d280ecb
+ F src/whereInt.h 8a215acde0f833a4dea3d30a7bbed9f48b4b547b5d5e34cd02acee366476ab80
 -F src/wherecode.c 8da0f873278ed6aad42bf2028404d7178dd9cfcdc7179ecc61a87591a15a07d2
++F src/wherecode.c eea33d75290efe2bb3b1a6a7bc12fcda55b0b7ebda93cd1edd58d9fa5cfb5ff2
  F src/whereexpr.c 9f64c39e53070584e99e4d20c1dd3397e125fabbae8fd414ffec574c410ac7d3
- F src/window.c 5d3b397b0c026d0ff5890244ac41359e524c01ae31e78782e1ff418c3e271a9e
+ F src/window.c dfaec4abc6012cbc18e4a202ca3a5d5a0efcc4011d86a06d882ddaab8aedee4d
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
  F test/affinity2.test ce1aafc86e110685b324e9a763eab4f2a73f737842ec3b687bd965867de90627
  F test/affinity3.test eecb0dabee4b7765a8465439d5e99429279ffba23ca74a7eae270a452799f9e7
@@@ -1956,8 -1957,8 +1959,8 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P 126d7a1d88c6d383b158a20d996a9f3b416b477554e36e1b72d43add4c35b523 02daae7a67927e5e6188e16219a453e7fa1b27cface6616171dd7cde717aca51
- R bd914bbea79a11bf21080163bc0bfcf8
 -P 02daae7a67927e5e6188e16219a453e7fa1b27cface6616171dd7cde717aca51 a8db69411b0d1275909adeb21027784ada17af24efe3a59ae0ae2a897659ff17
 -R d3a825a70991aba4988e43f815069f24
++P ef6fc89507ef4c430c062b29b41e3a71c0ba5449c5493b3540653c6f78b9da61 dae81f45d2bee8e5bced2564a6a85ffb23dc93fce6547760cd811acddbc09e25
++R 377d76d2d108b01b5a7dec7f642e2011
  U drh
- Z 665967bb0bdc9656286e06c5988d9813
 -Z 5101960e875508d300aed0c1856cfe51
++Z e7ac54545866984354d19104badf18b1
  # Remove this line to create a well-formed Fossil manifest.

diff --cc manifest.uuid
index c7ded9585a798e2c2b99754bb7fa6f4c75bf1617,09edbbe9e7cfa85c12acd2fa597c4c64455184ba..33ac627ab0e6ed10ad3baa07e6a26243092fb998
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- ef6fc89507ef4c430c062b29b41e3a71c0ba5449c5493b3540653c6f78b9da61
 -dae81f45d2bee8e5bced2564a6a85ffb23dc93fce6547760cd811acddbc09e25
++42e6d842abc4adf8b7f4d245fabaf06badd535a54399d1214872e97d82e8c915

diff --cc src/backup.c
Simple merge

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