From: drh <>
Date: Wed, 4 May 2022 14:46:08 +0000 (+0000)
Subject: Merge ON-clause constraint usage fix from trunk into the joinD branch.
X-Git-Tag: version-3.39.0~167^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b2cc3cf36ee5802b21a04d15fe8c2631a856dc47;p=thirdparty%2Fsqlite.git

Merge ON-clause constraint usage fix from trunk into the joinD branch.

FossilOrigin-Name: 0a20d4a85964fb5f2060b9522356ad2711f41d0d526ba3d2e58fc51029878298
---

b2cc3cf36ee5802b21a04d15fe8c2631a856dc47
diff --cc manifest
index b4b9177d61,65831b7807..d44ee42fff
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C New\stest\scases\susing\svarious\sjoin\stypes\sand\sBloom\sfilters.\s\sTwo\scases\ndiffer\sfrom\sPG\sand\sneed\sto\sbe\sresolved.
- D 2022-05-04T11:49:26.461
 -C Fix\sON-clause\sconstraint\susage\sfor\sFULL\sand\sRIGHT\sJOINs.
 -D 2022-05-04T14:45:19.529
++C Merge\sON-clause\sconstraint\susage\sfix\sfrom\strunk\sinto\sthe\sjoinD\sbranch.
++D 2022-05-04T14:46:08.113
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -1952,11 -1951,8 +1952,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 9fb20a21feb8f6979812f45691e06aa3e297d7370cf0d5820523e817a4e97863
- R 1cecd5f53d4f5e59729da8bc3d52cbbb
- T *branch * joinD
- T *sym-joinD *
- T -sym-trunk *
 -R d74d2aa039568ce071dd683a6739d947
++P befa8cbc0682bc3269f87e392a1f3d4baacf4db7c716ea84192bb9c13c99490b 544268a723cafdf0460221f5f018e752836436bad0fac90852cec70e63d9dcde
++R 3fa9af57dc36108f156d9655a983b60c
  U drh
- Z fd017d0848e05371e5483ff3dffc569c
 -Z 8ab0a178246eeb862fc914300baceadc
++Z 77216fee7696ce64d1faeda84f2db610
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index e97130cfc5,d213c503ba..992ca0ebf8
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- befa8cbc0682bc3269f87e392a1f3d4baacf4db7c716ea84192bb9c13c99490b
 -544268a723cafdf0460221f5f018e752836436bad0fac90852cec70e63d9dcde
++0a20d4a85964fb5f2060b9522356ad2711f41d0d526ba3d2e58fc51029878298