From: drh <>
Date: Tue, 1 Jul 2025 15:13:37 +0000 (+0000)
Subject: Merge trunk fixes into the empty-table-optimizations branch.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e1910ed1d293616aa72e8252e4f7d0242fba1e1f;p=thirdparty%2Fsqlite.git

Merge trunk fixes into the empty-table-optimizations branch.

FossilOrigin-Name: 63306e447efb3ac17e789a331ed3bb65459eb8b79d66e9c185ba3bd852f34ce3
---

e1910ed1d293616aa72e8252e4f7d0242fba1e1f
diff --cc manifest
index 88cc0f7f5e,2ad2bf276f..aeed276c7b
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C More\saggressive\soptimization\sof\saddrHalt\sfor\sRIGHT\sJOIN.
- D 2025-06-30T21:07:08.690
 -C When\sattempting\sto\soptimize\s"expr\sAND\sfalse"\sto\s"false"\sand\n"expr\sIN\s()"\sto\s"false",\stake\scare\snot\sto\sdelete\saggregate\sfunctions\nin\sthe\s"expr"\sas\sdoing\sso\scan\schange\sthe\smeaning\sof\sthe\squery.\nSee\s[forum:/forumpost/f4878de3e7dd4764|forum\sthread\sf4878de3e7].
 -D 2025-07-01T12:43:13.553
++C Merge\strunk\sfixes\sinto\sthe\sempty-table-optimizations\sbranch.
++D 2025-07-01T15:13:37.905
  F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@@ -2208,8 -2208,8 +2208,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 6fc0b9ac23be6840542982de4bb282ebca1db8b5ab3baefdde95a997c1506e81
- R 6c3da4fefe78ebf60c93e1bf3ae9f682
 -P 0083d5169a46104a25355bdd9d5a2f4027b049191ebda571dd228477ec217296
 -R 5553c1556e276f88c28d502c01300a73
++P 5e51d1c0dfcafef9e71c99de3f626dee157c935724b84c6e0c630299a880446f 77397bd67d918db57d5ac545d6d963194806fdabcdaa8f822b6b09e4cfe8b715
++R 39f5afdd6a59111507e595026db59dca
  U drh
- Z c1632b7819f69e809c6c7ab2b9282264
 -Z e4ebde7f728ace48d0401e6104bc5bfa
++Z 62755fb71345b006d78fb55f4b8a83a8
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index c009925a2d,b3e5a34f7d..75156e4313
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 5e51d1c0dfcafef9e71c99de3f626dee157c935724b84c6e0c630299a880446f
 -77397bd67d918db57d5ac545d6d963194806fdabcdaa8f822b6b09e4cfe8b715
++63306e447efb3ac17e789a331ed3bb65459eb8b79d66e9c185ba3bd852f34ce3