Merge the 3.40.0 rc1 changes into the wal2 branch.

FossilOrigin-Name: a5a610a650b6b49f4bb5fbb8e2f43c730afbe88df2c3ae4ddf3d1e5392960387

diff --cc main.mk
Simple merge

diff --cc manifest
index 52d03d1cda79e2cf7f2b29cfb46ee72b9727201e,856e6d99b8e7bb29470ab7345e8922e5a5e42edf..914e6c25c983de371496ff9ffb82e225f9b4630c
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\sthe\slatest\strunk\senhancements\sinto\sthe\swal2\sbranch.
- D 2022-11-04T18:58:48.181
 -C Remove\ssome\soutdated\scode\scomments.\sNo\scode\schanges.
 -D 2022-11-13T19:29:51.810
++C Merge\sthe\s3.40.0\src1\schanges\sinto\sthe\swal2\sbranch.
++D 2022-11-14T13:10:42.959
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -557,7 -556,7 +558,7 @@@ F ext/wasm/wasmfs.make edfd60691d10fd19
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 5ade0bc977aa135e79e3faaea894d5671b26107cc91e70783aa7dc83f22f3ba0
- F main.mk 66bea436ba2e638af65e3321c7fc6306ba7e68ea07b30ba0e719bd857afc6a66
 -F main.mk fd90f1bd90bd4070c9af7e9c8396bd0cf4208a0186c8d18fa6e2609dff447d5d
++F main.mk 8727f7e8fa78df7c2f20f7cb25db5afb07c5dacba7e0f2c3e1405c7800b497bc
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
  F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
  F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
@@@ -577,7 -576,7 +578,7 @@@ F src/auth.c f4fa91b6a90bbc8e0d0f738aa2
  F src/backup.c a2891172438e385fdbe97c11c9745676bec54f518d4447090af97189fd8e52d7
  F src/bitvec.c 7c849aac407230278445cb069bebc5f89bf2ddd87c5ed9459b070a9175707b3d
  F src/btmutex.c 6ffb0a22c19e2f9110be0964d0731d2ef1c67b5f7fabfbaeb7b9dabc4b7740ca
- F src/btree.c 12fcfc2c72a43064bb81160cb8c228f61366f8c8e2823bd62f734f9d63c17bac
 -F src/btree.c 6321ff29261bf9726e6b231058ff21b1ccf9f441a0b718b76c37341b16fa14ce
++F src/btree.c 61a7a3bf180c56d96f25cbe44652aa236fd969d4eae52ea9856b0e622425f71b
  F src/btree.h 74d64b8f28cfa4a894d14d4ed64fa432cd697b98b61708d4351482ae15913e22
  F src/btreeInt.h 8ce1332edd89dfd2461d561ac10a0ab5601c8e06200cb5230596c3caaf54482e
  F src/build.c d3e43e950e4e377c1d451a4862556792acdef1faba14a03f899d30d09731c48b
@@@ -623,15 -622,15 +624,15 @@@ F src/os_common.h b2f4707a603e36811d9b1
  F src/os_kv.c 0e59600d25b72034c7666b8b7dcc527f039b5d9c16f24a7eca4c08c66f63c364
  F src/os_setup.h 6011ad7af5db4e05155f385eb3a9b4470688de6f65d6166b8956e58a3d872107
  F src/os_unix.c 287aa5f5691a2b356780c63e83abaa33549add84227b8313395f04088486d79c
- F src/os_win.c 8d129ae3e59e0fa900e20d0ad789e96f2e08177f0b00b53cdda65c40331e0902
+ F src/os_win.c 295fe45f18bd86f2477f4cd79f3377c6f883ceb941b1f46808665c73747f2345
  F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
 -F src/pager.c 6176d9752eb580419e8fef4592dc417a6b00ddfd43ee22f818819bf8840ceee8
 -F src/pager.h f82e9844166e1585f5786837ddc7709966138ced17f568c16af7ccf946c2baa3
 +F src/pager.c fb35fb2c3f4f9a654989170b9d12e4e11daf329f6816b49c049f867473699f51
 +F src/pager.h c49ff262186a78bc5f27e3891edefb900afa769b9e2eaeca0322c7f3553536d4
  F src/parse.y 8e67d820030d2655b9942ffe61c1e7e6b96cea2f2f72183533299393907d0564
  F src/pcache.c f4268f7f73c6a3db12ce22fd25bc68dc42315d19599414ab1207d7cf32f79197
  F src/pcache.h 4f87acd914cef5016fae3030343540d75f5b85a1877eed1a2a19b9f284248586
  F src/pcache1.c dee95e3cd2b61e6512dc814c5ab76d5eb36f0bfc9441dbb4260fccc0d12bbddc
- F src/pragma.c 49a34aba78f9ad034d46b894c158e0c4199d6eb07cfa8263e75fe374ec223950
 -F src/pragma.c 894c2621d35edd4beea9b331cfdb1b42032394420074d2294c8febe548eea8a1
++F src/pragma.c f96c2f99bb5c9c9a3a6978a381d909ac9abd04ac884245019d98010899348c42
  F src/pragma.h e690a356c18e98414d2e870ea791c1be1545a714ba623719deb63f7f226d8bb7
  F src/prepare.c 1b02be0441eda4579471fea097f678effcbb77ef0c39ab3f703c837822bcd674
  F src/printf.c e99ee9741e79ae3873458146f59644276657340385ade4e76a5f5d1c25793764
@@@ -1387,9 -1386,9 +1388,9 @@@ F test/parser1.test 6ccdf5e459a5dc4673d
  F test/pcache.test c8acbedd3b6fd0f9a7ca887a83b11d24a007972b
  F test/pcache2.test af7f3deb1a819f77a6d0d81534e97d1cf62cd442
  F test/percentile.test 4243af26b8f3f4555abe166f723715a1f74c77ff
 -F test/permutations.test 3e0d6eea70e5087f3240b1a2fe621b0c73445f38a262029f0a1d2d89564026f7
 +F test/permutations.test 41fa86410297fd2cd465d8bb78b344594da9fa7e93230a5c1b3f8910a8e196b5
  F test/pg_common.tcl 3b27542224db1e713ae387459b5d117c836a5f6e328846922993b6d2b7640d9f
- F test/pragma.test cae534c12a033a5c319ccc94f50b32811acdef9f67bf19a82ff42697caccd69f
+ F test/pragma.test 620622fb0815f1cbea8e26e1d8abad38e0cbcbed8927fd84048fe9fd6239e323
  F test/pragma2.test e5d5c176360c321344249354c0c16aec46214c9f
  F test/pragma3.test 92a46bbea12322dd94a404f49edcfbfc913a2c98115f0d030a7459bb4712ef31
  F test/pragma4.test ca5e4dfc46adfe490f75d73734f70349d95a199e6510973899e502eef2c8b1f8
@@@ -2068,8 -2055,8 +2069,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 c22c7c879846b1357c00741700b7f6d1111c4b94895b4e7f552c92299d35712e 454c61e818f6941c9a23f6600e37828a3f2b2ad3c6dbc8d6223570aed5d9cd8b
- R d82300227a8d363c8df2dd030152f353
 -P 1d81381e8f5db5d7064cc313b8544ca3cb1ca9e8cd61e71368a2d2e598befc9c
 -R 8d5e86d1a1bdc524e4c55f68c15dd1eb
 -U stephan
 -Z 3535ec90e400bedefa2bb2a3ed0778e8
++P ca63a1bee16d30677c20c7576361dfb9a359e6e1b2b2b58a574da0059d3a8822 80ff592a9d0157bfa8bd1f9959c3aa26cab0ec16fdccf7b58a7523b8912c1a8c
++R 18495764295620ba5114f10b8d4ae59a
 +U drh
- Z 10380d3b31c8c83428a7794cf68eaaf0
++Z 689cb11bdb8407f60825c9d50a7fd9fb
  # Remove this line to create a well-formed Fossil manifest.

diff --cc manifest.uuid
index cdd6b612455ebefceb3a4d5cda77b36016a43119,38754ac3fdd145313c95e5591d88f920f70f282c..9443f65f1ba065e15ce50368f58626f97e32263e
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- ca63a1bee16d30677c20c7576361dfb9a359e6e1b2b2b58a574da0059d3a8822
 -80ff592a9d0157bfa8bd1f9959c3aa26cab0ec16fdccf7b58a7523b8912c1a8c
++a5a610a650b6b49f4bb5fbb8e2f43c730afbe88df2c3ae4ddf3d1e5392960387

diff --cc src/btree.c
Simple merge

diff --cc src/pragma.c
Simple merge