]> git.ipfire.org Git - thirdparty/sqlite.git/commitdiff
Merge the latest trunk enhancements into the exists-to-join branch.
authordrh <>
Thu, 27 Jun 2024 14:54:15 +0000 (14:54 +0000)
committerdrh <>
Thu, 27 Jun 2024 14:54:15 +0000 (14:54 +0000)
FossilOrigin-Name: fc643f8a12e9b7448136b281f798e18dfebe0a3df5115d930b965c8a33933e2d

1  2 
manifest
manifest.uuid
src/select.c
src/sqliteInt.h

diff --cc manifest
index e374d68b4b30886df6b3c5438cdd0f7dc41c0c9b,83472c33cfb5430fa71c6ba0e8377af4ffdabfc3..1c123b94a70afd47e39d9b7925e691680b963641
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Do\snot\sattempt\sthe\sexists-to-join\soptimization\sif\sthe\sFROM\sclause\sis\sfull.
- D 2024-06-20T12:07:25.967
 -C Fix\san\sincorrect\stcl\scomment\sthat\sappeared\sin\smany\sfts5\stest\sfiles.
 -D 2024-06-24T18:06:15.031
++C Merge\sthe\slatest\strunk\senhancements\sinto\sthe\sexists-to-join\sbranch.
++D 2024-06-27T14:54:15.037
  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 72883bd7dda5e67cdf097776ae5d83aab02fbad9c4fa3ae1e25516efb1401fd4
- F src/shell.c.in ad27d1d990e9e5fb7ae8fc38a717e91f55233714f59723e5618baf4a2a3d2b65
- F src/sqlite.h.in cbd3e4177791a61c056fd81e37a5b21bb6c8cb2ea8cac558c625974673f50acf
 -F src/select.c d26ac0a13b4154cbd71a9a57ca024350cd73f0f6fcf0ca0cbb4537e2d5b3e257
++F src/select.c d92f158185cf5aedc058bbe1eefba070b5dc57a5d71cb66625c3d2a906037829
+ F src/shell.c.in 2ccbed6a9fd451399b0f378aafa323ad2286fa9de54ae0cd28f32907cd94d18d
+ F src/sqlite.h.in 6c884a87bbf8828562b49272025a1e66e3801a196a58b0bdec87edcd2c9c8fc1
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h 3f046c04ea3595d6bfda99b781926b17e672fd6d27da2ba6d8d8fc39981dcb54
- F src/sqliteInt.h b0c079cec6aa6a133af52489c14a4d8c2d750889594299d83eab1ae1b12979c0
 -F src/sqliteInt.h 76f4bf5adce98a989bf9b792b962bc8f739e79636a63d841e567017370acd607
++F src/sqliteInt.h 36aaff552ecdf273ab6d14bd87d01175d8d5c88267b6d8b04e8f513c5d27efc9
  F src/sqliteLimit.h 6878ab64bdeb8c24a1d762d45635e34b96da21132179023338c93f820eee6728
  F src/status.c cb11f8589a6912af2da3bb1ec509a94dd8ef27df4d4c1a97e0bcf2309ece972b
  F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
@@@ -2198,8 -2195,8 +2198,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 ae19ff9ba819439fd107e745b6e8e503e5b68bfdb9da58b74035413704ad3caf
- R 2e2a21654277825e58e413fb627048c9
 -P 56d265f956fe6433b625c6d732e55f387af3f643e705316f5a6f709d63731669
 -R 5ad9950c3d8fa87fe57068f06313a6c9
 -U dan
 -Z 3992b6a75558611778f9237da672a1e0
++P 8e3a1d2850337a902ab36b1d6a0dad4ae35030b71d1e15547f6e7487c1f86d18 d07085e2035b52a7edd27980523225e59c5bf851fb4a6de975f03e653b937c9c
++R 4bccf9946bb839298bd611ecb98c6563
 +U drh
- Z 5d427b052ed84b4ca59ddb925bd74f93
++Z fabaa312611792ffca3e18aa282f1001
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 3ef5d46fbc42654ce506a9171ad142dd77f76244,73edec88bb2104b43135547a30c2cea057ffad5a..499a42453e26752d4ad1f5893931a34d5ec94687
@@@ -1,1 -1,1 +1,1 @@@
- 8e3a1d2850337a902ab36b1d6a0dad4ae35030b71d1e15547f6e7487c1f86d18
 -d07085e2035b52a7edd27980523225e59c5bf851fb4a6de975f03e653b937c9c
++fc643f8a12e9b7448136b281f798e18dfebe0a3df5115d930b965c8a33933e2d
diff --cc src/select.c
Simple merge
diff --cc src/sqliteInt.h
Simple merge