Merge 3.40.0 rc1 into the begin-concurrent branch.

FossilOrigin-Name: 5ba588e7eb04205aac134061c7c33c844c8b8ac33ff2ead3f53c59ae52afdc2e

diff --cc main.mk
index 4edb642f24f2e150d0577d766dd322dc1347c507,76c62fcecdb5812ffe83388e93a480956f257f53..a8d32affe305f4df9c2c859bbe458f410fac79a4
--- 1/main.mk
--- 2/main.mk
+++ b/main.mk
@@@ -445,11 -448,7 +448,8 @@@ TESTSRC2 = 
    $(TOP)/ext/async/sqlite3async.c \
    $(TOP)/ext/misc/stmt.c \
    $(TOP)/ext/session/sqlite3session.c \
 +  $(TOP)/ext/session/sqlite3changebatch.c \
    $(TOP)/ext/session/test_session.c \
-   $(TOP)/ext/recover/sqlite3recover.c \
-   $(TOP)/ext/recover/dbdata.c \
-   $(TOP)/ext/recover/test_recover.c \
    fts5.c
  
  # Header files used by all library source files.

diff --cc manifest
index 191a4d6c5b65a3b7c970db69d0a521cea3a7724b,856e6d99b8e7bb29470ab7345e8922e5a5e42edf..1b7387c3b07c45ba6a8b41a6307ea7202cb2395c
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\sthe\slatest\strunk\senhancements\sinto\sthe\sbegin-concurrent\sbranch.
- D 2022-11-04T18:33:52.322
 -C Remove\ssome\soutdated\scode\scomments.\sNo\scode\schanges.
 -D 2022-11-13T19:29:51.810
++C Merge\s3.40.0\src1\sinto\sthe\sbegin-concurrent\sbranch.
++D 2022-11-14T12:44:31.890
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -560,7 -556,7 +561,7 @@@ F ext/wasm/wasmfs.make edfd60691d10fd19
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 5ade0bc977aa135e79e3faaea894d5671b26107cc91e70783aa7dc83f22f3ba0
- F main.mk 33e2abd07be2d99706dc2557294de7b0c3deb362a8716668e99d548a1285a175
 -F main.mk fd90f1bd90bd4070c9af7e9c8396bd0cf4208a0186c8d18fa6e2609dff447d5d
++F main.mk 5f36606a98229c62011bbbfc013f46db2930145ecbdc6f10407b2167f59f1101
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
  F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
  F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
@@@ -578,12 -574,12 +579,12 @@@ F src/analyze.c d2fce73f6a024897593012c
  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 6ffb0a22c19e2f9110be0964d0731d2ef1c67b5f7fabfbaeb7b9dabc4b7740ca
- F src/btree.c a058e19b91074bdef482258e5b4aa6e5c88585ac6a52e9252d8e98e8525eadfd
 -F src/btree.c 6321ff29261bf9726e6b231058ff21b1ccf9f441a0b718b76c37341b16fa14ce
 -F src/btree.h 74d64b8f28cfa4a894d14d4ed64fa432cd697b98b61708d4351482ae15913e22
 -F src/btreeInt.h 8ce1332edd89dfd2461d561ac10a0ab5601c8e06200cb5230596c3caaf54482e
 -F src/build.c d3e43e950e4e377c1d451a4862556792acdef1faba14a03f899d30d09731c48b
++F src/btree.c 7fe482a41da06760bfb5f46da5043a62ad98ed22f1d5714058f053899ec5b0e6
 +F src/btree.h 900067641b64d619e6e2a93bd115c952a52f41d3bee32e551e2a4ceee05fc431
 +F src/btreeInt.h 650add92a0ffc8c315406f140325c5f41f0e386848dafbb1e27a72fe7cf6f179
 +F src/build.c dd4b69d26a9e18467dc3d3612f472ba0c5ad4b34de45e1c3b367b5c64c993066
  F src/callback.c 4cd7225b26a97f7de5fee5ae10464bed5a78f2adefe19534cc2095b3a8ca484a
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
  F src/ctime.c 20507cc0b0a6c19cd882fcd0eaeda32ae6a4229fb4b024cfdf3183043d9b703d
@@@ -625,28 -621,28 +626,28 @@@ F src/os.h 1ff5ae51d339d0e30d8a9d814f4b
  F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
  F src/os_kv.c 0e59600d25b72034c7666b8b7dcc527f039b5d9c16f24a7eca4c08c66f63c364
  F src/os_setup.h 6011ad7af5db4e05155f385eb3a9b4470688de6f65d6166b8956e58a3d872107
 -F src/os_unix.c 287aa5f5691a2b356780c63e83abaa33549add84227b8313395f04088486d79c
 +F src/os_unix.c b036cebe7344894e7c6ec26eeb9912699c9475242858555c1aa9dd99fae2d5a1
- 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/parse.y 8e67d820030d2655b9942ffe61c1e7e6b96cea2f2f72183533299393907d0564
 +F src/pager.c a992a87f6eaf5c850934d2b0469c6d50adafdff2a1fa425179ad4ca910a67838
 +F src/pager.h 7b2ec7bba30b21a97b68d5bdc0dbb82a75f48c4b1457180988f9d409fb789e16
 +F src/parse.y 17c50d262d92083badeb60b3ebe4725e19c76548f90aea898ab07d4f2940a7d8
  F src/pcache.c f4268f7f73c6a3db12ce22fd25bc68dc42315d19599414ab1207d7cf32f79197
  F src/pcache.h 4f87acd914cef5016fae3030343540d75f5b85a1877eed1a2a19b9f284248586
  F src/pcache1.c dee95e3cd2b61e6512dc814c5ab76d5eb36f0bfc9441dbb4260fccc0d12bbddc
- F src/pragma.c 41430ca04735cc8e5d003bfd9315eadede3ec326e50805cc81bcf34e46601292
+ F src/pragma.c 894c2621d35edd4beea9b331cfdb1b42032394420074d2294c8febe548eea8a1
 -F src/pragma.h e690a356c18e98414d2e870ea791c1be1545a714ba623719deb63f7f226d8bb7
 +F src/pragma.h 1f421360eed1a7721e8c521463df8519a7c8d0d5893ebd9dbfe0dba8de996f8c
  F src/prepare.c 1b02be0441eda4579471fea097f678effcbb77ef0c39ab3f703c837822bcd674
  F src/printf.c e99ee9741e79ae3873458146f59644276657340385ade4e76a5f5d1c25793764
- F src/random.c 47c95aa668a3ba343b89645614e26ecfad444d732ec934fc35c6feb258b69478
 -F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
++F src/random.c a3e70f8515721ff24d2c0e6afd83923e8faab5ab79ececea4c1bf9fe4049fbb2
  F src/resolve.c efea4e5fbecfd6d0a9071b0be0d952620991673391b6ffaaf4c277b0bb674633
  F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
- F src/select.c 8f376b788138a6e70a00a466d62ae01382284811f45ac5ec6385ec7f4bcb5eee
- F src/shell.c.in 84bb08d8762920285f08f1c0993f1b3992ac43af5d72445cb8a973fc50c71923
- F src/sqlite.h.in 0a3272d06780400fddec94ca2d0fbd6402e0d913905844096c1cbcba4a5b0a59
 -F src/select.c 9886d6669f5787471aab6ae52af76fad90b53edb1c218fc9ed9d953363bc5184
++F src/select.c 363bef2cd043d0ba070ffcaabac6b52a209c2aa59eb34935b547db7eb8268139
+ F src/shell.c.in 458cb3de9d548342fc645b699620b1af3de770d2ceec09ac71f86c19bd244064
 -F src/sqlite.h.in bdb10b78166f5b735318667eb16c84ac90d9e0de88cc25c193eeb4379a126945
++F src/sqlite.h.in 88bd91bf629f608400af52c01de8e9cfd04584b68ddafb329b095bbe80c4c62e
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h c4b9fa7a7e2bcdf850cfeb4b8a91d5ec47b7a00033bc996fd2ee96cbf2741f5f
 -F src/sqliteInt.h 2c24ba38f78e32fe5d7ec136321a6ad827698b33ca98664970a8b7274d69ef7c
 +F src/sqliteInt.h ca227b85962a4c96bb00e71a1b296f1dd5e8ef48a6a51025a4ca046d46725a2c
  F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657
  F src/status.c 160c445d7d28c984a0eae38c144f6419311ed3eace59b44ac6dafc20db4af749
  F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
@@@ -2001,8 -1986,8 +2002,8 @@@ F tool/mkmsvcmin.tcl 6ecab9fe22c2c8de4d
  F tool/mkopcodec.tcl 33d20791e191df43209b77d37f0ff0904620b28465cca6990cf8d60da61a07ef
  F tool/mkopcodeh.tcl bcb2bd5affb545fd219ef0304c7978e2a356407ab723f45ec8569235892c1c3f
  F tool/mkopts.tcl 680f785fdb09729fd9ac50632413da4eadbdf9071535e3f26d03795828ab07fa
 -F tool/mkpragmatab.tcl bd07bd59d45d0f3448e123d6937e9811195f9908a51e09d774609883055bfd3d
 +F tool/mkpragmatab.tcl 8dcba40365eceba24f059d82bbc8b61bb647d5a0b8076f24a1876872a1b58832
- F tool/mkshellc.tcl df5d249617f9cc94d5c48eb0401673eb3f31f383ecbc54e8a13ca3dd97e89450
+ F tool/mkshellc.tcl 02d0de8349ef830c0fb20d29680320bde2466e2ec422e5bd94c4317a7a7e8cc9
  F tool/mksourceid.c 36aa8020014aed0836fd13c51d6dc9219b0df1761d6b5f58ff5b616211b079b9
  F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
  F tool/mksqlite3c-noext.tcl 4f7cfef5152b0c91920355cbfc1d608a4ad242cb819f1aea07f6d0274f584a7f
@@@ -2070,8 -2055,8 +2071,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 ba2539f6dee1fff4a7603554da2d91be76f8af3c523e113a7629c2dd31dacd72 c1c47eff48e0831b5aed987e90d797aee99caf1861fa8318c6c3ecfb108de7e6
- R bf958186228ce7e7a1b0c12cffdb1ccf
 -P 1d81381e8f5db5d7064cc313b8544ca3cb1ca9e8cd61e71368a2d2e598befc9c
 -R 8d5e86d1a1bdc524e4c55f68c15dd1eb
 -U stephan
 -Z 3535ec90e400bedefa2bb2a3ed0778e8
++P b361ee983ca45e8ede70413c549d50d20c69a055f387c5ce749da9600374921b 80ff592a9d0157bfa8bd1f9959c3aa26cab0ec16fdccf7b58a7523b8912c1a8c
++R 331d9100dfab8ce00f5ab297a28c37f0
 +U drh
- Z b6a9d38d1c48a8ec98920f9ddbf93ba6
++Z 5ba6748d81219217eefeb369bd9456bc
  # Remove this line to create a well-formed Fossil manifest.

diff --cc manifest.uuid
index 5c69d2a611518deead79881728644dbe0795ec96,38754ac3fdd145313c95e5591d88f920f70f282c..450be4df691877f240d5880ac055de00d43fbd56
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- b361ee983ca45e8ede70413c549d50d20c69a055f387c5ce749da9600374921b
 -80ff592a9d0157bfa8bd1f9959c3aa26cab0ec16fdccf7b58a7523b8912c1a8c
++5ba588e7eb04205aac134061c7c33c844c8b8ac33ff2ead3f53c59ae52afdc2e

diff --cc src/btree.c
index 72506eca56dd405dbd8ce2346710ea5c998d5403,df24b7b33c2de01c66b095f437b5107a2d9ee08c..61650ef09e6b49d88798a4ef0562a1d8564d86ce
--- 1/src/btree.c
--- 2/src/btree.c
+++ b/src/btree.c
@@@ -6711,11 -6252,11 +6711,11 @@@ static int allocateBtreePage
    Pgno mxPage;     /* Total size of the database file */
  
    assert( sqlite3_mutex_held(pBt->mutex) );
 -  assert( eMode==BTALLOC_ANY || (nearby>0 && IfNotOmitAV(pBt->autoVacuum)) );
 +  assert( eMode==BTALLOC_ANY || (nearby>0 && REQUIRE_PTRMAP ) );
    pPage1 = pBt->pPage1;
    mxPage = btreePagecount(pBt);
-   /* EVIDENCE-OF: R-05119-02637 The 4-byte big-endian integer at offset 36
-   ** stores stores the total number of pages on the freelist. */
+   /* EVIDENCE-OF: R-21003-45125 The 4-byte big-endian integer at offset 36
+   ** stores the total number of pages on the freelist. */
    n = get4byte(&pPage1->aData[36]);
    testcase( n==mxPage-1 );
    if( n>=mxPage ){

diff --cc src/random.c
Simple merge

diff --cc src/select.c
Simple merge

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