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

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

FossilOrigin-Name: c7b9cc645b394a1b638a9a13ca83d321215aaa78d69ca70c6baa0ee692ed21bf
---

451393c4f46c071b9af1a422c93f00c4ba77e8fd
diff --cc manifest
index 75da856216,afb62b8e86..f956a6c0bd
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\strunk\schanges\sinto\sthe\sindex-expr-opt\sbranch.
- D 2022-10-17T16:31:55.281
 -C Fix\ssqlite3VdbeRecordCompareWithSkip()\sso\sthat\sit\ssorts\sthe\sinternal-use\nserial-type\sof\s10\stogether\swith\sNULLs.\ndbsqlfuzz\s5ff35e9d49a5fcca5051e23960ff2f483a538bab
 -D 2022-10-18T10:27:06.495
++C Merge\strunk\sfixes\sinto\sthe\sindex-expr-opt\sbranch.
++D 2022-10-18T11:28:33.210
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -2033,8 -2035,8 +2035,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 8f460b3b15bf4b88a224907d2f83e4ed6bf84d6b3f480008a1b187ea49c6ce1d b6413a6dff8ac9b7088b1381afbbbf799e376455d11786530cc5fc825747ab53
- R b72777913e19bbbdbff94b30aa294e78
 -P c9080b6505b839cc0bb5bd25ce7df0daa91a0a303d037ffe6e77888c8584b932
 -R c6933aa36b3965399e80dc36fb15b922
++P a1485ce6c8374135290eb0a1e4eb4e225497ad7096847a4e2377c9c054946ca7 4fb77e96fa89a23a9365320c4190834edd6c09cfaf1ca30b34ce19b747ebbec0
++R 06e54729ebe8b28a1f23ad9b3ac13bf6
  U drh
- Z f862d5509bce1d889210db6919a1c731
 -Z f66ba4d30fb256e3ce3a8281933b3c32
++Z 583beba47cad975fdaa8bbe5cfc4a890
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 4b71e361ca,82a1ebdb17..e0bbcc5217
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- a1485ce6c8374135290eb0a1e4eb4e225497ad7096847a4e2377c9c054946ca7
 -4fb77e96fa89a23a9365320c4190834edd6c09cfaf1ca30b34ce19b747ebbec0
++c7b9cc645b394a1b638a9a13ca83d321215aaa78d69ca70c6baa0ee692ed21bf