]> git.ipfire.org Git - thirdparty/sqlite.git/commitdiff
Merge the latest changes from trunk. agg-orderby
authordrh <>
Thu, 19 Oct 2023 01:09:49 +0000 (01:09 +0000)
committerdrh <>
Thu, 19 Oct 2023 01:09:49 +0000 (01:09 +0000)
FossilOrigin-Name: d18bc400146812c8c5048af7eaf4a5371ddd80fc9ce895d253b6114b9eae7fc3

1  2 
manifest
manifest.uuid
src/expr.c

diff --cc manifest
index f402a01bd6892403f80208994eb9bf2b414f0ec5,28a5a3f0e58da993f7cb5a9e4cd7a14c3b740ff2..afe1a53188586b758d6006fa3b65e55e6b617958
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Changes\sfor\stest\scoverage.
- D 2023-10-18T23:48:24.293
 -C Fix\sa\sfalse-positive\sin\srun-time\serror\schecking.
 -D 2023-10-19T00:25:35.141
++C Merge\sthe\slatest\schanges\sfrom\strunk.
++D 2023-10-19T01:09:49.757
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -668,7 -668,7 +668,7 @@@ F src/date.c eebc54a00e888d3c56147779e9
  F src/dbpage.c 80e46e1df623ec40486da7a5086cb723b0275a6e2a7b01d9f9b5da0f04ba2782
  F src/dbstat.c 3b677254d512fcafd4d0b341bf267b38b235ccfddbef24f9154e19360fa22e43
  F src/delete.c cb766727c78e715f9fb7ec8a7d03658ed2a3016343ca687acfcec9083cdca500
- F src/expr.c 167dcf2ecc7ea7c6c2ce0c56eeec6a7d3c805c8d2721cb76a1790fe917a6f86d
 -F src/expr.c 243ef7e11095afe09cccd157ce5f42e637ae34f064ebb6ad12297e7af02f9e5a
++F src/expr.c 6090c2d44a8b705618dff2e9e5c26742125c95cd937a21467dd792546318e6ee
  F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
  F src/fkey.c a7fcbf7e66d14dbb73cf49f31489ebf66d0e6006c62b95246924a3bae9f37b36
  F src/func.c e8d7b3587a225f4f1116f720b72090511fe9feb936e960bd26a053cea6a17a63
@@@ -2133,8 -2132,8 +2133,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 648ddb3a8eb358fc6c95aaa561ae68476c77996abda23890054ac07166278cef
- R 8ee0996b86b0afe5585fa6ea088a2916
 -P da1a47932ea96755b1e11fc2547ce11780b87846af6885857318ff18f1e62c31
 -R 2dc67760b798e4f6a6331f176070e794
++P ddfa09c6031afd4391a9888381bf09214cd542a826b431eeb1537a070f65c5f9 cd63eec0758960d9ee63d7b964ec62e2bd622f8c94a58bd9556046381ffa18d0
++R 560408bb648a1c13d94a9c653c0e9458
  U drh
- Z c40adbb172f79debd1a61052cc23946c
 -Z a96532a01a60297c343bac9ca71674a1
++Z 2bb43f5245d591adc8abfec187beac22
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 994c21ecb434f276027185197ffae69b42584cfe,d2f4420581ec90add0a0eb21bb649126a2502ad4..1b51a5a293fab89ef3e2737a65ca7fcf2e33a9c5
@@@ -1,1 -1,1 +1,1 @@@
- ddfa09c6031afd4391a9888381bf09214cd542a826b431eeb1537a070f65c5f9
 -cd63eec0758960d9ee63d7b964ec62e2bd622f8c94a58bd9556046381ffa18d0
++d18bc400146812c8c5048af7eaf4a5371ddd80fc9ce895d253b6114b9eae7fc3
diff --cc src/expr.c
Simple merge