From: drh <>
Date: Thu, 2 Oct 2025 15:30:26 +0000 (+0000)
Subject: Merge recent trunk fixes and enhancements into the alter-table-constraints branch.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9abd7edaa764ae89bb79ea8027676cd1d9a5c7f3;p=thirdparty%2Fsqlite.git

Merge recent trunk fixes and enhancements into the alter-table-constraints branch.

FossilOrigin-Name: 26f8a700785edf64e2540b37c748e9f201870865ba70374f8681cdfdd048e68f
---

9abd7edaa764ae89bb79ea8027676cd1d9a5c7f3
diff --cc manifest
index 2f502a29b6,1f3d9dc0b1..8bc86ed80a
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\ssome\sproblems\swith\sDROP\sCONSTRAINT\sand\sDROP\sNOT\sNULL\son\sgenerated\scolumns.
- D 2025-10-01T17:27:23.371
 -C Fix\s-DSQLITE_OS_OTHER=0\sbuilds.
 -D 2025-10-02T14:48:27.422
++C Merge\srecent\strunk\sfixes\sand\senhancements\sinto\sthe\salter-table-constraints\sbranch.
++D 2025-10-02T15:30:26.036
  F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@@ -2171,8 -2169,8 +2171,8 @@@ F tool/version-info.c 3b36468a90faf1bbd
  F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
  F tool/warnings.sh 1ad0169b022b280bcaaf94a7fa231591be96b514230ab5c98fbf15cd7df842dd
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 1c6f09f9f95ba76efa4f11f1c05d405d799b43f3570b23791472c3e165971bbc
- R 1674535639316908637a4df60255a2ab
 -P 22b2700ac20bb8e5883d484bfd0aee7a0fbc99b92696d8ca850cd129e2ccbb43
 -R 399a433d692825e6557f7aa80a566057
--U dan
- Z db2f59c1797ee523a66c1a9dbd0f2362
 -Z 1d09f435c80c1e511337c9686eefb17c
++P 66c47e18e6e1b69df4c2ceb63ff20423bbc1d5819934d77b140cf321fa14eac5 2971d7470110fcd43bdc8ad5d09d1f2f63f5a3bccda41810948a683e310ad908
++R 45e19a3fd4f7b0095a338b8111df1404
++U drh
++Z 8614520122323f279e234e85d1d9bd10
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 8d4ca84281,d2a50cbd98..559bd67e2c
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 66c47e18e6e1b69df4c2ceb63ff20423bbc1d5819934d77b140cf321fa14eac5
 -2971d7470110fcd43bdc8ad5d09d1f2f63f5a3bccda41810948a683e310ad908
++26f8a700785edf64e2540b37c748e9f201870865ba70374f8681cdfdd048e68f