From: drh <>
Date: Tue, 18 Oct 2022 16:32:22 +0000 (+0000)
Subject: Merge recent trunk fixes into the index-expr-opt branch.
X-Git-Tag: version-3.40.0~134^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9489e0a5d71361b790fea4060ef525b6e265f4be;p=thirdparty%2Fsqlite.git

Merge recent trunk fixes into the index-expr-opt branch.

FossilOrigin-Name: 6198ab4b871c464448ae303072bde0a810cac566a516cc29b1bf806fbd0a6c7b
---

9489e0a5d71361b790fea4060ef525b6e265f4be
diff --cc manifest
index f956a6c0bd,cb6da43b72..7dd1de75d8
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\strunk\sfixes\sinto\sthe\sindex-expr-opt\sbranch.
- D 2022-10-18T11:28:33.210
 -C Add\snew\stest\sfile\swindowE.test,\sto\stest\sthe\swindow\sfunctions\smodules\sresponse\sto\san\sinconsistent\scollation\ssequence.
 -D 2022-10-18T15:02:08.725
++C Merge\srecent\strunk\sfixes\sinto\sthe\sindex-expr-opt\sbranch.
++D 2022-10-18T16:32:22.335
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -2035,8 -2036,8 +2036,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 a1485ce6c8374135290eb0a1e4eb4e225497ad7096847a4e2377c9c054946ca7 4fb77e96fa89a23a9365320c4190834edd6c09cfaf1ca30b34ce19b747ebbec0
- R 06e54729ebe8b28a1f23ad9b3ac13bf6
 -P 904b54625d985e742888e06ba792cab316b9ec9d6669d9cf509bac48030373ca
 -R 609c010622cb8a1edf242ffa07ea33a0
 -U dan
 -Z 47ec91d5045ad14459bc2cd80292963b
++P c7b9cc645b394a1b638a9a13ca83d321215aaa78d69ca70c6baa0ee692ed21bf 740a2eb0928d54fdf735a8e573c6a61a34dbd295b46e5b6ef39e957fd2623293
++R f7f5f954c4cc82eef2f394d97ecd28bc
 +U drh
- Z 583beba47cad975fdaa8bbe5cfc4a890
++Z 298a7ba276579f138f35bb1c8d732eed
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index e0bbcc5217,d617a968ca..52c2ac163e
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- c7b9cc645b394a1b638a9a13ca83d321215aaa78d69ca70c6baa0ee692ed21bf
 -740a2eb0928d54fdf735a8e573c6a61a34dbd295b46e5b6ef39e957fd2623293
++6198ab4b871c464448ae303072bde0a810cac566a516cc29b1bf806fbd0a6c7b