From: drh <>
Date: Fri, 22 Apr 2022 09:57:57 +0000 (+0000)
Subject: Merge the latest trunk fixes into the right-join branch.
X-Git-Tag: version-3.39.0~203^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8318b55d874a523d3a3d278e52b1664c87d4ae4d;p=thirdparty%2Fsqlite.git

Merge the latest trunk fixes into the right-join branch.

FossilOrigin-Name: c74dc574c3b24a7d3533202f33b15341b043cfd89a80250563e6771ab6b6b8a7
---

8318b55d874a523d3a3d278e52b1664c87d4ae4d
diff --cc manifest
index 3100e2ab68,6279c85f81..8fd84c938a
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\sharmless\scompiler\swarnings.
- D 2022-04-21T19:25:51.652
 -C Previous\sfix\sto\sjoin8.test\sneeds\sa\sreturn.
 -D 2022-04-21T23:34:35.567
++C Merge\sthe\slatest\strunk\sfixes\sinto\sthe\sright-join\sbranch.
++D 2022-04-22T09:57:57.238
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -1950,8 -1950,8 +1950,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 fd328e52aee1dace12b1c2f44b6f7e9d15d8f77c8e9d9e3d85840a129a4b1808
- R 98fca67b285a824f5cacf5d0926743e5
 -P 94e1916a2f594e6b8a54734027deb99688244d05cefb3c78f23afab49af1e08f
++P 29255664127a975e5b0d5767cd4e56d93ff2ea1994702cdfbdca1b700952502e 7b4cd705a0339ddacad19564b07e50e4f68f54bf14dd2cd5d59b39314a4d2523
+ R 573150bf22fddc6433562bcb5d5bac98
  U drh
- Z 97d3cf4d3664df607159e68c652388e1
 -Z a95960d40040bb3ed2298fba0fa35ab1
++Z 6f92506738c5bfa628c9724dc6f28600
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 3517c1b3ce,c126036c75..552535ae7d
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 29255664127a975e5b0d5767cd4e56d93ff2ea1994702cdfbdca1b700952502e
 -7b4cd705a0339ddacad19564b07e50e4f68f54bf14dd2cd5d59b39314a4d2523
++c74dc574c3b24a7d3533202f33b15341b043cfd89a80250563e6771ab6b6b8a7