From: drh <>
Date: Mon, 28 Nov 2022 16:11:10 +0000 (+0000)
Subject: Merge trunk changes into covering-index-expr branch.
X-Git-Tag: version-3.41.0~361^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8ffa77f3a92aeaa8048156e84fbfae76ea875317;p=thirdparty%2Fsqlite.git

Merge trunk changes into covering-index-expr branch.

FossilOrigin-Name: 89d775ada39aed4dc532374ace02156d07dc06e8ae54a194608af0c5a582d20f
---

8ffa77f3a92aeaa8048156e84fbfae76ea875317
diff --cc manifest
index f0f6a8af9b,477c836f77..c83d4173b2
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Rework\sthe\scovering\sindex\schecking\sroutine,\swhereIsCoveringIndex(),\sso\sthat\nit\scan\sreturn\sa\s"maybe"\sresult\sfor\saggregate\squeries\swhere\swe\sare\snot\sexactly\nsure.\s\sThe\sindex\sis\sscored\sas\sif\sit\sis\scovering,\sbut\sthe\smain\stable\sis\nstill\sopened.
- D 2022-11-28T15:23:53.775
 -C Add\s(optional)\sbase64\sand\sbase85\sUDF\sextensions.
 -D 2022-11-28T14:51:50.439
++C Merge\strunk\schanges\sinto\scovering-index-expr\sbranch.
++D 2022-11-28T16:11:10.036
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -2060,8 -2064,8 +2064,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 17ebcf316b91042c823eea7bb6f1309325023cb5c70538cdb2ce932caee2ef05
- R 254ab4db9b1e239ec16eb2e1a31dc657
 -P a2449bcc2c71d0f4c3289621fbf1cb97f0f407c9f7b5bf18245b7854a07c6cfa b8345630a2a322234bda49ee4b996f6ba20e2b080621e229a2ec5e820892a663
 -R b25d12f698cc565856f0ef09be44e05e
 -U larrybr
 -Z dca654d0507bf9deef15f6de6a6be007
++P b8eec4214363192e6f3e12b3faa5810d8269a5fdaecab3ec09b02e5002cf798a b44ab10c49bc2895483a9d40813be3798710ee713cc4bf04e449dce55a68452a
++R 5944640ae5b4a3237e1d8a4c46c48db4
 +U drh
- Z 489a805b1f3c740affbc27a0febf881c
++Z 9aa95e661b7edb77eed478b829e7796d
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index d0a052a41d,2d5baba61d..e7c719444e
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- b8eec4214363192e6f3e12b3faa5810d8269a5fdaecab3ec09b02e5002cf798a
 -b44ab10c49bc2895483a9d40813be3798710ee713cc4bf04e449dce55a68452a
++89d775ada39aed4dc532374ace02156d07dc06e8ae54a194608af0c5a582d20f