Merge the latest trunk enhancements into the begin-concurrent-pnu-wal2 branch.

FossilOrigin-Name: 82e7e836011f52c09196aa6af9519cd9f584881d41dcbcdb23969e863c6e4fb0

diff --cc Makefile.in
Simple merge

diff --cc main.mk
Simple merge

diff --cc manifest
index f78312e015b8881aa166928ec4822cd3aa0e73c0,9807fbe4a89f16ebaad00cf91a469c138ca3aca3..cec5077bdbc2a98376246af160fa34faa544f823
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,11 -1,11 +1,11 @@@
 -C Merge\sthe\slatest\strunk\senhancements\sinto\sthe\swal2\sbranch.
 -D 2022-06-16T13:44:49.125
 +C Merge\sthe\slatest\strunk\senhancements\sinto\sthe\sbegin-concurrent-pnu-wal2\sbranch.
- D 2022-05-28T14:51:49.106
++D 2022-06-16T13:56:11.692
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
- F Makefile.in 337572b2fd6b68da2452cdbcf76e61395b48e4bcea6133ac5d4ea4779238960c
 -F Makefile.in 915ed9176f23f867575c1bd4e2d4b8a60e4e61965538b52418508f1c226558c4
++F Makefile.in 691c11bbac3a6c711fbabca79200284fde88b5e12de966ef31d7195be2db570b
  F Makefile.linux-gcc f609543700659711fbd230eced1f01353117621dccae7b9fb70daa64236c5241
- F Makefile.msc f969c28231012e50ee07c5062ee1dd5bbfc00883d52573af44b4fd477ec63843
+ F Makefile.msc 028810319c9b921358303610bc64b0b7689b23a5810435a56bc268d45bdbee3f
  F README.md 8b8df9ca852aeac4864eb1e400002633ee6db84065bd01b78c33817f97d31f5e
  F VERSION fa8e7d2d1cc962f9e14c6d410387cf75860ee139462763fda887c1be4261f824
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -496,7 -493,7 +499,7 @@@ F ext/userauth/userauth.c 7f00cded7dcaa
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk a4cd0654947e8477d993a47fe46547b6e45150a91873f540fc59622bbd340676
 -F main.mk d486b4a787c6836371d1f769e7f29074c519d7ec998bc09c036018a0adae6207
++F main.mk 971dba6cabcc04576af0f0375b83cd6b77f8cb28b5955a320b361066dc99fc98
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
  F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
  F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
@@@ -513,12 -510,12 +516,12 @@@ F src/analyze.c aabdf3769c7fd9954a8ec50
  F src/attach.c 4431f82f0247bf3aaf91589acafdff77d1882235c95407b36da1585c765fbbc8
  F src/auth.c f4fa91b6a90bbc8e0d0f738aa284551739c9543a367071f55574681e0f24f8cf
  F src/backup.c a2891172438e385fdbe97c11c9745676bec54f518d4447090af97189fd8e52d7
 -F src/bitvec.c 7c849aac407230278445cb069bebc5f89bf2ddd87c5ed9459b070a9175707b3d
 +F src/bitvec.c 3907fcbe8a0c8c2db58d97087d15cdabbf2842adb9125df9ab9ff87d3db16775
  F src/btmutex.c 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6
- F src/btree.c 38b64fb83d2e52c10ac2c90900e4ec421688936bcff420ff7314791902ba0d89
 -F src/btree.c db537493a3aaa2ee44631bb9ddad305b457561531114b5b084d7286ad0ea5a12
 -F src/btree.h 74d64b8f28cfa4a894d14d4ed64fa432cd697b98b61708d4351482ae15913e22
 -F src/btreeInt.h 8ce1332edd89dfd2461d561ac10a0ab5601c8e06200cb5230596c3caaf54482e
 -F src/build.c 23f874642825d7eaaeeb7a3281b2b1a75e1d4c4dd9ae4dceddcd908266634214
++F src/btree.c 67ff46685037fc4a2259628c48f842709ac1c74bbaf976699432b62a8b6c4ac4
 +F src/btree.h 900067641b64d619e6e2a93bd115c952a52f41d3bee32e551e2a4ceee05fc431
 +F src/btreeInt.h 650add92a0ffc8c315406f140325c5f41f0e386848dafbb1e27a72fe7cf6f179
 +F src/build.c a961c81e446fd9c2ca064aa4e5210b088601fbe037b87563c01c8c4becb915d4
  F src/callback.c 4c19af69835787bfe790ac560f3071a824eb629f34e41f97b52ce5235c77de1c
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
  F src/ctime.c 026dbdcdbd8c3cde98a88483ee88310ff43150ab164ad768f12cc700a11495ad
@@@ -526,10 -523,10 +529,10 @@@ F src/date.c 15082566229d4b1e5f24fdb490
  F src/dbpage.c 90661a87e1db8bfbc8d2ebbdcd3749651ddb287c555c07a28fb17c7c591ffb68
  F src/dbstat.c 861e08690fcb0f2ee1165eff0060ea8d4f3e2ea10f80dab7d32ad70443a6ff2d
  F src/delete.c a8e844af211a48b13b5b358be77a12c860c6a557c21990ad51a548e2536500ce
- F src/expr.c 19507ae3244402860cac2944be3b92bf9a8b50212fbfabaf7e9817127fec7c00
+ F src/expr.c 4907afcb86d72b5525d8767515ce425ec53c7a2d3664441b46cef5b376ee0cba
  F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
  F src/fkey.c d965ede15d8360c09ed59348940649ee647b192e784466837d7aefa836d1d91e
- F src/func.c 3bce86597c046051fab5e76d322e6df89d7f986722e74e9b06f9afe1afbbe7d7
 -F src/func.c 8f72e88cccdee22185133c10f96ccd61dc34c5ea4b1fa9a73c237ef59b2e64f1
++F src/func.c c4b2229aac24b3d7989ef51abae0e5e87e58e8bda3c7b6c55f76d231dbedfb8d
  F src/global.c e83ee571b79ee3adc32e380cf554cf1254bc43763d23786c71721fbcdfbbb965
  F src/hash.c 8d7dda241d0ebdafb6ffdeda3149a412d7df75102cecfc1021c98d6219823b19
  F src/hash.h 3340ab6e1d13e725571d7cee6d3e3135f0779a7d8e76a9ce0a85971fa3953c51
@@@ -559,33 -556,33 +562,33 @@@ F src/os.c b1c4f2d485961e9a5b6b648c3668
  F src/os.h 1ff5ae51d339d0e30d8a9d814f4b8f8e448169304d83a7ed9db66a65732f3e63
  F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
  F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586
 -F src/os_unix.c 2df2b33db88f00af13805d4573ee126bc5973f9e3b91d03c575fa7ba64e7dc41
 +F src/os_unix.c b59e0e8346b072bd6d8a14cbcb4a8dff0e1973b6e2261523c15fb34dd9516666
  F src/os_win.c a8ea80037e81127ca01959daa87387cc135f325c88dc745376c4f760de852a10
  F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
- F src/pager.c 99d9ac7bdadc57a8cc1ab5395eef365e960d51f5acb2da1e58759daeb6695cee
 -F src/pager.c adb8600c3ff85ad95973379f7132c01d6f2cc5265df959ac3d589f075d004dc3
 -F src/pager.h c49ff262186a78bc5f27e3891edefb900afa769b9e2eaeca0322c7f3553536d4
 -F src/parse.y 8e67d820030d2655b9942ffe61c1e7e6b96cea2f2f72183533299393907d0564
++F src/pager.c 66cd2ddc147b6ad0e1523a4d88d8008737967a976706d6bfc0591c06cdaac3a2
 +F src/pager.h 3ddab454e313da7c93f92fea35c842ad17ae9f4e96254871ddb0171b2bfb859a
 +F src/parse.y 17c50d262d92083badeb60b3ebe4725e19c76548f90aea898ab07d4f2940a7d8
  F src/pcache.c 084e638432c610f95aea72b8509f0845d2791293f39d1b82f0c0a7e089c3bb6b
  F src/pcache.h 4f87acd914cef5016fae3030343540d75f5b85a1877eed1a2a19b9f284248586
  F src/pcache1.c 54881292a9a5db202b2c0ac541c5e3ef9a5e8c4f1c1383adb2601d5499a60e65
  F src/pragma.c 3aae3282d87f8301a916311a1e581b3194fe5b03372f509fb6cd94b9e8c6504d
 -F src/pragma.h e690a356c18e98414d2e870ea791c1be1545a714ba623719deb63f7f226d8bb7
 +F src/pragma.h 1f421360eed1a7721e8c521463df8519a7c8d0d5893ebd9dbfe0dba8de996f8c
  F src/prepare.c c62820c15dcb63013519c8e41d9f928d7478672cc902cfd0581c733c271dbf45
  F src/printf.c 6166a30417b05c5b2f82e1f183f75faa2926ad60531c0b688a57dbc951441a20
 -F src/random.c 097dc8b31b8fba5a9aca1697aeb9fd82078ec91be734c16bffda620ced7ab83c
 +F src/random.c c6e61d041f230d46c658e6dfe7165fc1ecb0093d5fe28cfe74f389d261dc3af8
  F src/resolve.c a4eb3c617027fd049b07432f3b942ea7151fa793a332a11a7d0f58c9539e104f
  F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
- F src/select.c 1fe2f931b7289960984226978fdd8a6eae2eb3095a464a736241bb693dd64301
- F src/shell.c.in b76e681f9e441928d574f21f9473ef615158bbeab1ae49f05ecab9d81730a51d
 -F src/select.c ee3113de67330163a35307eacb4188b6778fcae1e2d2f738a9dda2daa0346e24
++F src/select.c fe52e588e4e86aff734c47f915163d216b673ccca5d94dcc1909e874cf9953c6
+ F src/shell.c.in 08e59f1cb9d9b1180aba52861aaada0c95f6ddd210488719684e160a0724c806
 -F src/sqlite.h.in 172528c287399a34f188154017b7268bf82c6d5b780902e361958d2318c4e37c
 +F src/sqlite.h.in ae776f833186d61754229e190fd062d2b4f7e9ee49ffcb5808e212b12b1ba6fa
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h a988810c9b21c0dc36dc7a62735012339dc76fc7ab448fb0792721d30eacb69d
- F src/sqliteInt.h cb829a6fa26ec85d2876a7afe02ff93390df40afde79a593a8bf8771098e129f
 -F src/sqliteInt.h 8353e96646372efdb0795a13cd9949831b4992c928de8f5c43b2524e8a4c6e7b
++F src/sqliteInt.h a79c2ba9688950d2f547b8ce51da66ce883ab664004f9c2ee89806550195737f
  F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657
  F src/status.c 4a3da6d77eeb3531cb0dbdf7047772a2a1b99f98c69e90ce009c75fe6328b2c0
  F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
- F src/tclsqlite.c 1f6673991147bc2cecc08a40d22f9803b84c805b24b499fe727f392256f73474
+ F src/tclsqlite.c 4e64ba300a5a26e0f1170e09032429faeb65e45e8f3d1a7833e8edb69fc2979e
 -F src/test1.c 1356984e97bff07e4a8cc3863e892f05b3348678a74783bb6f350b76316736f1
 +F src/test1.c 95c688261edf59ff77676aca426b343beb9f90d6548ecb16189ce614e5a63620
  F src/test2.c 3efb99ab7f1fc8d154933e02ae1378bac9637da5
  F src/test3.c 61798bb0d38b915067a8c8e03f5a534b431181f802659a6616f9b4ff7d872644
  F src/test4.c 4533b76419e7feb41b40582554663ed3cd77aaa54e135cf76b3205098cd6e664
@@@ -640,32 -637,32 +643,32 @@@ F src/test_window.c cdae419fdcea5bad6dc
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
  F src/threads.c 4ae07fa022a3dc7c5beb373cf744a85d3c5c6c3c
  F src/tokenize.c a38f52058b517929e264094abd0b5fd1e8e145a1aa43bc6f6a72ae5218f96c98
- F src/treeview.c 73facf395c8841653b9a54e789d8c80e15bc3d0d1cb9d16104c2d889c15e33cd
+ F src/treeview.c c48bbb4b04a951dcecf95b464d0fe94930339af56688a77f18ee50a526bc1706
  F src/trigger.c 61bea163b1fa3039bc572ed8312461b978e5c527e5301f302b078f4c1ccdec6a
- F src/update.c ba5a02bf6be2a8c93b8279370360eff43526fcac86145d432900a888db02f51f
 -F src/update.c c52a7991bece0453d22c77c08469512ee2f1391c12503fd347d1c939220c5877
++F src/update.c c6fbfa86c7dbff057bb62b29e00846dec1468f12c62e1a575f745f87c5a55818
  F src/upsert.c 8789047a8f0a601ea42fa0256d1ba3190c13746b6ba940fe2d25643a7e991937
  F src/utf.c ee39565f0843775cc2c81135751ddd93eceb91a673ea2c57f61c76f288b041a0
  F src/util.c 602fe229f32a96ceccae4f40824129669582096f7c355f53dbac156c9fecef23
 -F src/vacuum.c bb346170b0b54c6683bba4a5983aea40485597fdf605c87ec8bc2e199fe88cd8
 -F src/vdbe.c 4842b98a3043d8fbb0e06de81492caac096a0625301e0f7a14270ad67b28df60
 +F src/vacuum.c 5b7888f917936dda09f98b1fda164cff1dad44fb5e143436bdbb9dc3191ce2df
- F src/vdbe.c 4b5440d6102be9a1a6c7e118384b56c60a34dcd91a73ccddb6dfd1c3ca9bed19
++F src/vdbe.c 8a8debbc8941e6a938340877d33a5a35c798fb66e0bfe1ced56dee11cf609600
  F src/vdbe.h 07641758ca8b4f4c6d81ea667ea167c541e6ece21f5574da11e3d21ec37e2662
- F src/vdbeInt.h ef43f7fdc5fde29fc3fd29c506c12830f366178fdb4edbbf0cbc3dfbd1278b5f
+ F src/vdbeInt.h 2cad0aeeb106371ed0e0946bab89f60627087068847afc2451c05056961c18da
  F src/vdbeapi.c 354c893f1500cf524cc45c32879b9c68893a28b77e3442c24668d6afe4236217
 -F src/vdbeaux.c 75c4f75ed7e1d12eb3d80093a160ec998c839f3008a1c3c967fc5acf522d0e3c
 +F src/vdbeaux.c 83e566a087cf1bf5901539554feb55d25b2be6be24d36c6682b2f30493c28006
  F src/vdbeblob.c 5e61ce31aca17db8fb60395407457a8c1c7fb471dde405e0cd675974611dcfcd
- F src/vdbemem.c 7189090b72baa025f945a1ac8c61ee420c645254476e8a191d555db76dfea5d4
+ F src/vdbemem.c 3db315458f8dc158aff58719795441437dd6c0fd302e9d9379a8f2a61e185ad6
  F src/vdbesort.c 43756031ca7430f7aec3ef904824a7883c4ede783e51f280d99b9b65c0796e35
  F src/vdbetrace.c fe0bc29ebd4e02c8bc5c1945f1d2e6be5927ec12c06d89b03ef2a4def34bf823
  F src/vdbevtab.c f99b275366c5fc5e2d99f734729880994ab9500bdafde7fae3b02d562b9d323c
  F src/vtab.c 3d72c780d1ea08906a198e4f033921a658a54590e3ed72c544995d84f3f9464a
  F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
 -F src/wal.c a9cc35881efbb97e568b654dffa2716cf4c5d3fd15489980ab96e48fc5bc60a7
 -F src/wal.h d01234e828943e002040c22a7e017642962f9fd9b2dc142fa599769ae4e459e9
 +F src/wal.c 8d7c4c78e403062d31a9c88638cfd1403849830517a9a4973a3db5d82ddd233d
 +F src/wal.h 7a733af13b966ecb81872ce397e862116b3575ea53245b90b139a2873ee87825
  F src/walker.c f890a3298418d7cba3b69b8803594fdc484ea241206a8dfa99db6dd36f8cbb3b
- F src/where.c c4b64c6fa224e5b89ed547ec0ebdfd243c081509b195e71581164a2fbb8d4a80
- F src/whereInt.h 8da918f392bf202ccc0ee61291455b33ad171d209445f1ff3eaf62e0b6f6b363
- F src/wherecode.c 2a8a73bcf1886632f2b2247c79395f94852a4b74484d8aa70a005892ce73d339
- F src/whereexpr.c 7c5ee52e1df81d6a43f39e6b6f35d540fd37254e2b6e953a4e2715c3abf26f46
+ F src/where.c 267caa227dd38ede46959468118ef4067316dae589d889c200911ff77df53ef1
+ F src/whereInt.h b48ca529ffe293c18cbfa8326af18a09e39910de66fb3e96ef788c7cbf8ef3a7
+ F src/wherecode.c 0b09abfcb88c61c6a6984a3e065786631ff35495e9bdf865e6b74ab0a1299c5b
+ F src/whereexpr.c 20255cf03e0b765b742301197d165511ff99e95da0d7ee9c8a2ebc1e888dd049
  F src/window.c fff1b51757438c664e471d5184634e48dcdf8ea34b640f3b1b0810b1e06de18c
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
  F test/affinity2.test ce1aafc86e110685b324e9a763eab4f2a73f737842ec3b687bd965867de90627
@@@ -2004,8 -1990,8 +2011,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 d28af1f8a5da1810d41766074560fc3a1ec8fdc22b1efa59056eae4e5c6b66a4 934656f13dabc41ccf307b10dca7377c758b8a3b93eca57c072745c2786d6b3c
- R dcc6ca262085ded666102005acbb17cf
 -P 934656f13dabc41ccf307b10dca7377c758b8a3b93eca57c072745c2786d6b3c 3a461f61b47e6ba6d5dcc2b7470ebde512b57bc68086f65050e07b06f42b7351
 -R 25e193ae4a494f5ff48654bafa28631f
++P 4d65f45b31c239d2a400376b30c486eb53113b0e7b594f2b7592df6027507e20 c8ad869938b06378f49c02655c00ee4f3315e1275d15e69d4ff61d6f60230fe8
++R 8006f1b670614752fb95879c3266c002
  U drh
- Z bcb029d76a2de3120f781cc07ae60343
 -Z b958844303a6732e4928e10fcec459d3
++Z 7f1a378b00ce0ec7472860270f1b278e
  # Remove this line to create a well-formed Fossil manifest.

diff --cc manifest.uuid
index 9cf80a7c43758d2cb3a2c456265154b3d97bb4b8,415de2a981ee801b563cf85d58840dc246e8b72b..3fd16f177f46ad1e0f4038d85f3518870b677f7c
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 4d65f45b31c239d2a400376b30c486eb53113b0e7b594f2b7592df6027507e20
 -c8ad869938b06378f49c02655c00ee4f3315e1275d15e69d4ff61d6f60230fe8
++82e7e836011f52c09196aa6af9519cd9f584881d41dcbcdb23969e863c6e4fb0

diff --cc src/btree.c
Simple merge

diff --cc src/func.c
Simple merge

diff --cc src/pager.c
Simple merge

diff --cc src/select.c
Simple merge

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/update.c
Simple merge

diff --cc src/vdbe.c
Simple merge