From: drh <>
Date: Mon, 14 Nov 2022 12:54:00 +0000 (+0000)
Subject: Merge the 3.40.0 rc1 changes into the begin-concurrent-report branch.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5ae9bd5ea830c33e249b6c19ebed6b05968c930e;p=thirdparty%2Fsqlite.git

Merge the 3.40.0 rc1 changes into the begin-concurrent-report branch.

FossilOrigin-Name: 4d3f2531a96eeca17a7e00f386c512be721785bdfccaff962931902f3ee4ba02
---

5ae9bd5ea830c33e249b6c19ebed6b05968c930e
diff --cc manifest
index 48136c0d9d,1b7387c3b0..52a4b084aa
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\sthe\slatest\strunk\senhancements\sinto\sthe\sbegin-concurrent-report\sbranch.
- D 2022-11-04T18:47:12.058
 -C Merge\s3.40.0\src1\sinto\sthe\sbegin-concurrent\sbranch.
 -D 2022-11-14T12:44:31.890
++C Merge\sthe\s3.40.0\src1\schanges\sinto\sthe\sbegin-concurrent-report\sbranch.
++D 2022-11-14T12:54:00.403
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -578,12 -578,12 +579,12 @@@ F src/alter.c 0390ca1d69ec3626cfa9f1531
  F src/analyze.c d2fce73f6a024897593012c6ca25368629fa4aeb49960d88a52fac664582e483
  F src/attach.c 4431f82f0247bf3aaf91589acafdff77d1882235c95407b36da1585c765fbbc8
  F src/auth.c f4fa91b6a90bbc8e0d0f738aa284551739c9543a367071f55574681e0f24f8cf
 -F src/backup.c a2891172438e385fdbe97c11c9745676bec54f518d4447090af97189fd8e52d7
 -F src/bitvec.c 3907fcbe8a0c8c2db58d97087d15cdabbf2842adb9125df9ab9ff87d3db16775
 +F src/backup.c 7c69378cf826e20778df98b33b80dd1976e96ad3cf6f2a0bc17e6e6b018148c6
 +F src/bitvec.c e67e4ebed581b5f0aa9155abd88177ed8b63eb40e9266b1483ce7f6eb9257477
  F src/btmutex.c 6ffb0a22c19e2f9110be0964d0731d2ef1c67b5f7fabfbaeb7b9dabc4b7740ca
- F src/btree.c 79d665f9b155bc240b728e6278cfa93a635db92c0fd164327ed854a50c193f0d
 -F src/btree.c 7fe482a41da06760bfb5f46da5043a62ad98ed22f1d5714058f053899ec5b0e6
 -F src/btree.h 900067641b64d619e6e2a93bd115c952a52f41d3bee32e551e2a4ceee05fc431
 -F src/btreeInt.h 650add92a0ffc8c315406f140325c5f41f0e386848dafbb1e27a72fe7cf6f179
++F src/btree.c 634ac44e75d44eefbaf098d6e423a9b22d861a035328b50e185e7fc41ec5eb40
 +F src/btree.h 1c1508834794c0d15fe15d23792cd42deefd8140ad782899eab258d081a0adfc
 +F src/btreeInt.h ed074f13b5464ea021fed9f8de2dc5cf45c7e5fa58ec98550fdc24229b11d25e
  F src/build.c dd4b69d26a9e18467dc3d3612f472ba0c5ad4b34de45e1c3b367b5c64c993066
  F src/callback.c 4cd7225b26a97f7de5fee5ae10464bed5a78f2adefe19534cc2095b3a8ca484a
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
@@@ -627,10 -627,10 +628,10 @@@ F src/os_common.h b2f4707a603e36811d9b1
  F src/os_kv.c 0e59600d25b72034c7666b8b7dcc527f039b5d9c16f24a7eca4c08c66f63c364
  F src/os_setup.h 6011ad7af5db4e05155f385eb3a9b4470688de6f65d6166b8956e58a3d872107
  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 a992a87f6eaf5c850934d2b0469c6d50adafdff2a1fa425179ad4ca910a67838
 -F src/pager.h 7b2ec7bba30b21a97b68d5bdc0dbb82a75f48c4b1457180988f9d409fb789e16
 +F src/pager.c 994f3aeb406974702b888df3e869fa26e3c376677d82e0d9f4a1a32c3c47bb41
 +F src/pager.h 03ea09dddd4852990d9151746a62b94ed1486f04abe5acc9ee0e80d8381bfcd9
  F src/parse.y 17c50d262d92083badeb60b3ebe4725e19c76548f90aea898ab07d4f2940a7d8
  F src/pcache.c f4268f7f73c6a3db12ce22fd25bc68dc42315d19599414ab1207d7cf32f79197
  F src/pcache.h 4f87acd914cef5016fae3030343540d75f5b85a1877eed1a2a19b9f284248586
@@@ -639,15 -639,15 +640,15 @@@ F src/pragma.c 894c2621d35edd4beea9b331
  F src/pragma.h 1f421360eed1a7721e8c521463df8519a7c8d0d5893ebd9dbfe0dba8de996f8c
  F src/prepare.c 1b02be0441eda4579471fea097f678effcbb77ef0c39ab3f703c837822bcd674
  F src/printf.c e99ee9741e79ae3873458146f59644276657340385ade4e76a5f5d1c25793764
- F src/random.c 47c95aa668a3ba343b89645614e26ecfad444d732ec934fc35c6feb258b69478
+ 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 65e969de4207c8d7ee09b21c07cb412f41da6ae60f96e4086f959e5ef75b6e30
+ F src/select.c 363bef2cd043d0ba070ffcaabac6b52a209c2aa59eb34935b547db7eb8268139
+ F src/shell.c.in 458cb3de9d548342fc645b699620b1af3de770d2ceec09ac71f86c19bd244064
 -F src/sqlite.h.in 88bd91bf629f608400af52c01de8e9cfd04584b68ddafb329b095bbe80c4c62e
++F src/sqlite.h.in 7b3b93d69c076bcdc6e7a2e1a6ae22ecb1d8fd6d05eb4553aef267eaa70256b1
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h c4b9fa7a7e2bcdf850cfeb4b8a91d5ec47b7a00033bc996fd2ee96cbf2741f5f
 -F src/sqliteInt.h ca227b85962a4c96bb00e71a1b296f1dd5e8ef48a6a51025a4ca046d46725a2c
 +F src/sqliteInt.h dee38fa7f58f084f788b41a60e801de5672835154727ded19f420292ea7145fa
  F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657
  F src/status.c 160c445d7d28c984a0eae38c144f6419311ed3eace59b44ac6dafc20db4af749
  F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
@@@ -2072,8 -2071,8 +2073,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 4d6141f32dabc34a512695dd40a02a2c67dddfd5e0a7232a86a1975b27932607 b361ee983ca45e8ede70413c549d50d20c69a055f387c5ce749da9600374921b
- R 2c97ec52c1f30bcec9cff63e780860c2
 -P b361ee983ca45e8ede70413c549d50d20c69a055f387c5ce749da9600374921b 80ff592a9d0157bfa8bd1f9959c3aa26cab0ec16fdccf7b58a7523b8912c1a8c
 -R 331d9100dfab8ce00f5ab297a28c37f0
++P d8568a848a6be369291bdbcc54d8b1093a7773656c8ed78d2e1e12cb7a24b5b8 5ba588e7eb04205aac134061c7c33c844c8b8ac33ff2ead3f53c59ae52afdc2e
++R d82f99537830be4b12deeb7efecce012
  U drh
- Z f2daa2182f1119ed965b038567780a9f
 -Z 5ba6748d81219217eefeb369bd9456bc
++Z b18d08583b4dba4b267520a57ea1fe96
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 207169d445,450be4df69..12186cc91a
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- d8568a848a6be369291bdbcc54d8b1093a7773656c8ed78d2e1e12cb7a24b5b8
 -5ba588e7eb04205aac134061c7c33c844c8b8ac33ff2ead3f53c59ae52afdc2e
++4d3f2531a96eeca17a7e00f386c512be721785bdfccaff962931902f3ee4ba02