From: drh <>
Date: Sat, 26 Nov 2022 20:13:54 +0000 (+0000)
Subject: Merge trunk fixes into the covering-indexed-expr branch.
X-Git-Tag: version-3.41.0~361^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8beb7f56f582d6336bca7f83ea1368c0498a42c3;p=thirdparty%2Fsqlite.git

Merge trunk fixes into the covering-indexed-expr branch.

FossilOrigin-Name: 9ac67ff968e874cf955e46e3993e3215c766feec3d5bdd38d77884eedd86b59e
---

8beb7f56f582d6336bca7f83ea1368c0498a42c3
diff --cc manifest
index a56bd219e4,a2d2f52121..1e9ca78250
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Experimental\schanges\sto\shelp\sthe\squery\splanner\sdetect\swhen\san\sexpression\nindex\sis\scoverting.\s\sWorks\ssomewhat,\sbut\sthere\sare\stests\sthat\sfail.
- D 2022-11-26T14:19:47.899
 -C Fix\san\sincorrect\sassertion-fault\sin\sthe\s"TREETRACE"\sdebugging\slogic\son\nselect.c.\s\sThe\sproblem\sdoes\snot\saffect\sproduction\sbuilds.
 -D 2022-11-26T20:12:02.257
++C Merge\strunk\sfixes\sinto\sthe\scovering-indexed-expr\sbranch.
++D 2022-11-26T20:13:54.129
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -2060,11 -2060,8 +2060,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 adbca3448e2099f0d6149a073978f230ed9a92a2f384779879ef89e672231bcf
- R b02bf662fd2aa7710f36a7d19197692a
- T *branch * covering-indexed-expr
- T *sym-covering-indexed-expr *
- T -sym-trunk *
 -P 9542f9ce9e023b489e2d93661f719fb0751c1e28f72fded9d3c2156d5777e7b1
 -R 581898efb4aefcef8555315298dbd7f7
++P 968c189bcf29a9b25305251a58d09b7d52ab9dd08f5057dc3ab1f7ad1a5316a0 f11bb42292d94e7b7687bd2134f72afe1353182238cb4837fc0a6d78a021dd7e
++R b11982e41348628501c0b91820bd7cd7
  U drh
- Z e78db49817bfc2647feb4d11db6b69e2
 -Z f6493a79b992a3696ede08a261d497d4
++Z 5e6dcb1170e4740f335f77683444a169
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 036305084f,d4e96fca06..25771bfcb7
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 968c189bcf29a9b25305251a58d09b7d52ab9dd08f5057dc3ab1f7ad1a5316a0
 -f11bb42292d94e7b7687bd2134f72afe1353182238cb4837fc0a6d78a021dd7e
++9ac67ff968e874cf955e46e3993e3215c766feec3d5bdd38d77884eedd86b59e