From: drh <>
Date: Mon, 14 Nov 2022 13:18:39 +0000 (+0000)
Subject: Merge the 3.40.0 rc1 changes into the begin-concurrent-pnu-wal2 branch.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=859e8b07dc1f6aefd903a735d4a6786e5914c10f;p=thirdparty%2Fsqlite.git

Merge the 3.40.0 rc1 changes into the begin-concurrent-pnu-wal2 branch.

FossilOrigin-Name: b0e2b9aa2c77af8c1e5b35a49f58610c8ac7063a63fd61c34bff6050348e068f
---

859e8b07dc1f6aefd903a735d4a6786e5914c10f
diff --cc main.mk
index 52fcdcd2ed,3bf620db2a..a8c38eab02
--- a/main.mk
+++ b/main.mk
@@@ -446,11 -449,7 +449,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 3dad987da3,914e6c25c9..95e80a36dd
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\sthe\slatest\strunk\senhancements\sinto\sthe\sbegin-concurrent-pnu-wal2\sbranch.
- D 2022-11-04T19:09:41.774
 -C Merge\sthe\s3.40.0\src1\schanges\sinto\sthe\swal2\sbranch.
 -D 2022-11-14T13:10:42.959
++C Merge\sthe\s3.40.0\src1\schanges\sinto\sthe\sbegin-concurrent-pnu-wal2\sbranch.
++D 2022-11-14T13:18:39.458
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -120,8 -119,8 +120,8 @@@ F ext/fts5/fts5_buffer.c 3001fbabb585d6
  F ext/fts5/fts5_config.c 501e7d3566bc92766b0e11c0109a7c5a6146bc41144195459af5422f6c2078aa
  F ext/fts5/fts5_expr.c 40174a64829d30cc86e8266306ad24980f6911edd5ca0b8c1ce7821ea1341b88
  F ext/fts5/fts5_hash.c d4fb70940359f2120ccd1de7ffe64cc3efe65de9e8995b822cd536ff64c96982
- F ext/fts5/fts5_index.c 4b1ac44c665667be970df780bd8e734748047bd30a971d0bb7e884af8ac6e62c
+ F ext/fts5/fts5_index.c a8ee270724ae1f958d0ce9897bcd60a5b760ecbeaa058fc8632805a283f1c20a
 -F ext/fts5/fts5_main.c 6078ae86d3b813753a4f1201054550aff21a3f660e97b30f200d2b1472874151
 +F ext/fts5/fts5_main.c 82687a852cb4229c24d5525c9c435592719149af73dc955490adc88a95e9b45e
  F ext/fts5/fts5_storage.c 76c6085239eb44424004c022e9da17a5ecd5aaec859fba90ad47d3b08f4c8082
  F ext/fts5/fts5_tcl.c b1445cbe69908c411df8084a10b2485500ac70a9c747cdc8cda175a3da59d8ae
  F ext/fts5/fts5_test_mi.c 08c11ec968148d4cb4119d96d819f8c1f329812c568bac3684f5464be177d3ee
@@@ -563,7 -558,7 +564,7 @@@ F ext/wasm/wasmfs.make edfd60691d10fd19
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 5ade0bc977aa135e79e3faaea894d5671b26107cc91e70783aa7dc83f22f3ba0
- F main.mk e458e3deb04302c8c90f4fddcb3a6dbdb35cf39b406760093fda75f625bb2e99
 -F main.mk 8727f7e8fa78df7c2f20f7cb25db5afb07c5dacba7e0f2c3e1405c7800b497bc
++F main.mk 7e5d15309a750dead03303bee72cd1c910660750c25d93c066db31e67e58d23c
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
  F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
  F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
@@@ -581,12 -576,12 +582,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 1ec9a2e72c4de9e4f8ae1e1c742159d217fab16d693edb35cc9f48541c2c2b5c
 -F src/btree.c 61a7a3bf180c56d96f25cbe44652aa236fd969d4eae52ea9856b0e622425f71b
 -F src/btree.h 74d64b8f28cfa4a894d14d4ed64fa432cd697b98b61708d4351482ae15913e22
 -F src/btreeInt.h 8ce1332edd89dfd2461d561ac10a0ab5601c8e06200cb5230596c3caaf54482e
 -F src/build.c d3e43e950e4e377c1d451a4862556792acdef1faba14a03f899d30d09731c48b
++F src/btree.c 4ad1f12ad1ba9dfd8cee8e67e772a7a7b8af3b9bdab1dd80e93180d7d7f37288
 +F src/btree.h 900067641b64d619e6e2a93bd115c952a52f41d3bee32e551e2a4ceee05fc431
 +F src/btreeInt.h 650add92a0ffc8c315406f140325c5f41f0e386848dafbb1e27a72fe7cf6f179
 +F src/build.c 73d472e3de6fb356bcfbb062814c95e6d5f6f986cbfc771fa3d906762faecaf7
  F src/callback.c 4cd7225b26a97f7de5fee5ae10464bed5a78f2adefe19534cc2095b3a8ca484a
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
  F src/ctime.c 20507cc0b0a6c19cd882fcd0eaeda32ae6a4229fb4b024cfdf3183043d9b703d
@@@ -628,28 -623,28 +629,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 6a1e13c207b146cf4b5d82d359cf80e38acd112e56e32b4403a76b98fb7a8ec7
- F src/os_win.c 8d129ae3e59e0fa900e20d0ad789e96f2e08177f0b00b53cdda65c40331e0902
+ F src/os_win.c 295fe45f18bd86f2477f4cd79f3377c6f883ceb941b1f46808665c73747f2345
  F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
 -F src/pager.c fb35fb2c3f4f9a654989170b9d12e4e11daf329f6816b49c049f867473699f51
 -F src/pager.h c49ff262186a78bc5f27e3891edefb900afa769b9e2eaeca0322c7f3553536d4
 -F src/parse.y 8e67d820030d2655b9942ffe61c1e7e6b96cea2f2f72183533299393907d0564
 +F src/pager.c 6d3a93a7abfcb17e69ceb8a5e78ab74a0234ebf2a87819cc63d5c6044e78834c
 +F src/pager.h 3ddab454e313da7c93f92fea35c842ad17ae9f4e96254871ddb0171b2bfb859a
 +F src/parse.y 17c50d262d92083badeb60b3ebe4725e19c76548f90aea898ab07d4f2940a7d8
  F src/pcache.c f4268f7f73c6a3db12ce22fd25bc68dc42315d19599414ab1207d7cf32f79197
  F src/pcache.h 4f87acd914cef5016fae3030343540d75f5b85a1877eed1a2a19b9f284248586
  F src/pcache1.c dee95e3cd2b61e6512dc814c5ab76d5eb36f0bfc9441dbb4260fccc0d12bbddc
- F src/pragma.c 49a34aba78f9ad034d46b894c158e0c4199d6eb07cfa8263e75fe374ec223950
+ F src/pragma.c f96c2f99bb5c9c9a3a6978a381d909ac9abd04ac884245019d98010899348c42
 -F src/pragma.h e690a356c18e98414d2e870ea791c1be1545a714ba623719deb63f7f226d8bb7
 +F src/pragma.h 1f421360eed1a7721e8c521463df8519a7c8d0d5893ebd9dbfe0dba8de996f8c
  F src/prepare.c 1b02be0441eda4579471fea097f678effcbb77ef0c39ab3f703c837822bcd674
  F src/printf.c e99ee9741e79ae3873458146f59644276657340385ade4e76a5f5d1c25793764
- F src/random.c f767e3c0048b408aa14bcdc084fdb9520b88bfdb7cd6d7e356f70c7ee26bcb45
 -F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
++F src/random.c 9bd018738ec450bf35d28050b4b33fa9a6eebf3aaefb1a1cff42dc14a7725673
  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 db846794194ce108b4dd343a516910b07cf0f7d8e3497b9a6028e792af1f5047
  F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657
  F src/status.c 160c445d7d28c984a0eae38c144f6419311ed3eace59b44ac6dafc20db4af749
  F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
@@@ -1403,9 -1387,10 +1404,9 @@@ F test/pagesize.test 5769fc62d8c890a83a
  F test/pcache.test c8acbedd3b6fd0f9a7ca887a83b11d24a007972b
  F test/pcache2.test af7f3deb1a819f77a6d0d81534e97d1cf62cd442
  F test/percentile.test 4243af26b8f3f4555abe166f723715a1f74c77ff
 -F test/permutations.test 41fa86410297fd2cd465d8bb78b344594da9fa7e93230a5c1b3f8910a8e196b5
 +F test/permutations.test cbe27f4ddf1911fa33dc1d2dc728349291d3c10dde43c79296834c456dda4380
  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
@@@ -2018,8 -2000,8 +2019,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
@@@ -2089,8 -2069,8 +2090,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 68a61513f9e064ed9e79638ec40f8bff1a8ee678793683e2725a4ce63563db6a ca63a1bee16d30677c20c7576361dfb9a359e6e1b2b2b58a574da0059d3a8822
- R 900ac2cb8b24aa88575d880a45e5a4fa
 -P ca63a1bee16d30677c20c7576361dfb9a359e6e1b2b2b58a574da0059d3a8822 80ff592a9d0157bfa8bd1f9959c3aa26cab0ec16fdccf7b58a7523b8912c1a8c
 -R 18495764295620ba5114f10b8d4ae59a
++P aa2e247b58dea930c4f0af3566d287f196ea178be8e994fc9eec685a89bebac8 a5a610a650b6b49f4bb5fbb8e2f43c730afbe88df2c3ae4ddf3d1e5392960387
++R bf634048a9309e706ba9fd2dd7b62edb
  U drh
- Z 0745285bfbc3b753b7aba0d7f64f67d0
 -Z 689cb11bdb8407f60825c9d50a7fd9fb
++Z fba0e24db4f0528106635cb0d3708ddc
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 537de37107,9443f65f1b..78b94f5024
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- aa2e247b58dea930c4f0af3566d287f196ea178be8e994fc9eec685a89bebac8
 -a5a610a650b6b49f4bb5fbb8e2f43c730afbe88df2c3ae4ddf3d1e5392960387
++b0e2b9aa2c77af8c1e5b35a49f58610c8ac7063a63fd61c34bff6050348e068f
diff --cc src/btree.c
index 1f2c9a401d,714e3180da..cd86742768
--- a/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 ){