From: drh <>
Date: Tue, 11 Jun 2024 17:37:36 +0000 (+0000)
Subject: Merge trunk enhancements into the exists-to-join branch.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b4f41b801ad0127c4f388882896c9d3ebdeb4321;p=thirdparty%2Fsqlite.git

Merge trunk enhancements into the exists-to-join branch.

FossilOrigin-Name: 5f25a9518a675efbd0525cc2f5595ee7bc7122be7cfecdf6b20c909185dea370
---

b4f41b801ad0127c4f388882896c9d3ebdeb4321
diff --cc manifest
index e555256083,2724500b35..0b5c406027
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Add\smissing\scalls\sto\ssqlite3exprSkipCollateAndLikely()\sto\sthe\senchancement\son\sthis\sbranch.
- D 2024-06-10T19:45:33.614
 -C Remove\ssome\sdead\sJS\scode\sand\supdate\ssome\sJS\sdocs.
 -D 2024-06-11T17:04:43.812
++C Merge\strunk\senhancements\sinto\sthe\sexists-to-join\sbranch.
++D 2024-06-11T17:37:36.892
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -753,14 -753,14 +753,14 @@@ F src/pragma.h e690a356c18e98414d2e870e
  F src/prepare.c d99931f45416652895e502328ca49fe782cfc4e1ebdcda13b3736d991ebf42ce
  F src/printf.c 8b250972305e14b365561be5117ed0fd364e4fd58968776df1ce64c6280b90f9
  F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 -F src/resolve.c 7e8d23ce7cdbfedf351a47e759f2722e8182ca10fd7580be43f4ce1f1a228145
 +F src/resolve.c 9c7786f032dea81487e7d94cb17849936f0e9b8891bfc91a6ac24ab193762804
  F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
 -F src/select.c ea0b75fce45e1f2c22f50ed2b6e2ddd7f66640948d0fc79a397917b4236a74af
 +F src/select.c 9c65721098bad3f2cf266ef8e6aa8c0d57a691a48c075d5e8b1a44fa4fa7e351
- F src/shell.c.in 77d12a0dab8724819e64a14d5fbaad91a934be2b22ad329708fba9ba78993f04
+ F src/shell.c.in ad27d1d990e9e5fb7ae8fc38a717e91f55233714f59723e5618baf4a2a3d2b65
  F src/sqlite.h.in cbd3e4177791a61c056fd81e37a5b21bb6c8cb2ea8cac558c625974673f50acf
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h 3f046c04ea3595d6bfda99b781926b17e672fd6d27da2ba6d8d8fc39981dcb54
- F src/sqliteInt.h b81970d56dcb4ed5fc53841ef8b75d42bf511cb9533584546113bc131de832eb
 -F src/sqliteInt.h af50738edf6a6cf9aa974b98d75bd0cedce607948dd10885ac6ae6cf5abae23c
++F src/sqliteInt.h c62b054b581abb051018ddc503bc292f3103db1e5ee16346f1495d46c07c5d3b
  F src/sqliteLimit.h 6878ab64bdeb8c24a1d762d45635e34b96da21132179023338c93f820eee6728
  F src/status.c cb11f8589a6912af2da3bb1ec509a94dd8ef27df4d4c1a97e0bcf2309ece972b
  F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
@@@ -2197,8 -2195,8 +2197,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 f3009a6d7facd1ead520d588c5ad089db76d8641cd3dae076f2405492d7defcd
- R 93b078b964e586d7ff51ddb903d178e0
- U dan
- Z 3d590655f4ffe6769b9e658507fd34f2
 -P 06e6f64533563ab9c059b773e5f0d78085df716f2624e547b7259f6789c3ffe0
 -R 79d342ace6fd539450d6954e121ef97a
 -U stephan
 -Z 878c1bfba19ab8a7570c53af656f275c
++P 078537d057d638389e3ab3bc04bcac53f342c7bf1d8d75222296ef42d09e9ee7 6935ac71bad3d36cc519f0325ae4447a674f257309d020cdc0741160fcce0580
++R b6e202e4f08c9d1d4b557c05911f57ed
++U drh
++Z 025c74f5e2115680217e065394f815d9
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 0d8e5a92ba,214309359d..78990c287e
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 078537d057d638389e3ab3bc04bcac53f342c7bf1d8d75222296ef42d09e9ee7
 -6935ac71bad3d36cc519f0325ae4447a674f257309d020cdc0741160fcce0580
++5f25a9518a675efbd0525cc2f5595ee7bc7122be7cfecdf6b20c909185dea370