From: drh <>
Date: Fri, 13 Sep 2024 23:41:16 +0000 (+0000)
Subject: Merge sqlite_dbpage fixes into the sqlite3-rsync branch.
X-Git-Tag: version-3.47.0~118^2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=33f0a3ed13c469af77f42a82a42e81fdda4fa2f1;p=thirdparty%2Fsqlite.git

Merge sqlite_dbpage fixes into the sqlite3-rsync branch.

FossilOrigin-Name: dff76b7a3436031ea5a61b8a44ddfa1d40ea20c983f3d34a8501cd7074db68b8
---

33f0a3ed13c469af77f42a82a42e81fdda4fa2f1
diff --cc manifest
index 447d4988e5,191df77f06..33a282bb46
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\sharmless\scompiler\swarning\son\sWindows.
- D 2024-09-13T16:12:54.397
 -C Bug\sfix\sin\sthe\senhanced\ssqlite_dbpage\sfor\swhen\struncating\stwo\sor\smore\nATTACH-ed\sdatabases\swithin\sthe\ssame\stransaction.
 -D 2024-09-13T21:47:57.423
++C Merge\ssqlite_dbpage\sfixes\sinto\sthe\ssqlite3-rsync\sbranch.
++D 2024-09-13T23:41:16.081
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -2213,8 -2212,8 +2213,8 @@@ F vsixtest/vsixtest.tcl 6195aba1f12a5e1
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P e55e3e8ec2fe3a9190872d999cee55c85bde92667040cc166233faaa2fa34266
- R 6b032d30c7c32f4ed5f1d114c751e049
 -P eb3c89ee2e4c5425be75deaf46a06a9cd8b210c695b918dd63a78f930c6e6b63
 -R c19f64698097fbdbb0ae983d8267bb4c
++P 86e0219d977c493ac19d00c3ddcf560eb317d506c7cf6e4ef17e92daa91e1762 6aa9c8e79b440c6419e65990d9ceba8f00a6f975455138cf2aa82b113daec825
++R 9005fc31425a0253e67d368b9122f599
  U drh
- Z c5bd48112d303e775518f5a9a4f43e77
 -Z b211655571bcb6e66e7014318509d82f
++Z 4975b1813e58aa71fc8abcda1ea8ca48
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index dc2a576f42,e4fde79e08..b895d5424d
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 86e0219d977c493ac19d00c3ddcf560eb317d506c7cf6e4ef17e92daa91e1762
 -6aa9c8e79b440c6419e65990d9ceba8f00a6f975455138cf2aa82b113daec825
++dff76b7a3436031ea5a61b8a44ddfa1d40ea20c983f3d34a8501cd7074db68b8