]> git.ipfire.org Git - thirdparty/sqlite.git/commitdiff
Merge latest trunk changes into this branch.
authordan <Dan Kennedy>
Mon, 26 Feb 2024 10:56:54 +0000 (10:56 +0000)
committerdan <Dan Kennedy>
Mon, 26 Feb 2024 10:56:54 +0000 (10:56 +0000)
FossilOrigin-Name: b6371ff9f5c3d4e87a5b1127a82970202f74c790b828dda20df88dd727bcc9b4

1  2 
manifest
manifest.uuid

diff --cc manifest
index 732ad1f72cd07c1505f8cc1ffe6e5ef762591cf4,034aae79aad9ebfb731a20664087dd8acf8c4498..f34154f89003ccb3b11a8ad8ea8b8fcc6b7e260c
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Add\sfurther\stests\sfor\sthe\sintck\smodule.
- D 2024-02-24T16:26:15.674
 -C Make\ssure\skey\scomprisons\sare\sdone\scorrectly\sif\sthe\sindex\skey\scontains\sNaN\nvalues\sthat\shave\snot\sbeen\sshifted\sinto\sNULLs.\s\sThat\scan\sonly\shappen\sdue\sto\ndatabase\scorruption,\sbut\swe\sneed\sto\sdeal\swith\sit\snevertheless.
 -D 2024-02-25T21:30:33.710
++C Merge\slatest\strunk\schanges\sinto\sthis\sbranch.
++D 2024-02-26T10:56:54.404
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -749,8 -742,8 +751,8 @@@ F src/random.c 606b00941a1d7dd09c381d32
  F src/resolve.c d77c6160bc8f249c2196fdd3e75f66a1dd70e37aa25c39aedc7b1f93c42b7c6d
  F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
  F src/select.c 43fabfc01bf87addd15e39f112f1e2ade15b19594835ab8a9e5bd50839d4e1b1
 -F src/shell.c.in e4a38496290d3979ea3d953fba0bc187d350d6e80f8e33c2e37b9a924850439b
 +F src/shell.c.in 0c13f7cc3bb8c31190efbd96f5c1d8f2fafdbcad549424b7e7850cb5617b115a
- F src/sqlite.h.in 020d7b7307dda51420dc48b47e5334eaface77baba6bd9818375d392eb3ab5b5
+ F src/sqlite.h.in 19a2db3995a699bd7f6dfb423856242bfceb7ec849a93c91d241d19fc28d9f0f
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h 3f046c04ea3595d6bfda99b781926b17e672fd6d27da2ba6d8d8fc39981dcb54
  F src/sqliteInt.h 2f3a38c3e0470b6152ec14f698e6f3310831e3c09b6e56f046a12c3e3bdd5cd4
@@@ -2171,8 -2164,8 +2173,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 351d46b2373f08bc8033d0902d9f67cd6c8bcc16c0d9f787e4fb279c0a76da87
- R 38b420c887519ac9a48b5a886e5c9758
 -P 5f21e6a8ee709d8c5ec12c45e8dc702a7d0bb041f31b5715e28cd904dfd566b0
 -R 6483dab5f9a5754b844e2de29e4108e4
 -U drh
 -Z 27901e47f4de6ad53eaa2c16e520ba30
++P c253e276b29de28a18270d01b60d95157ce3fc4b37e246d991f9119d26e718d7 7e4c743f9e6ef33500795543e6db9a77c533025bf00c2ee97abd433a3871b5a1
++R d91900a2b738ceadf979774120590e4a
 +U dan
- Z 449a9c9353165606d5987b5f74af35a1
++Z 9b2321809e4d89643b001730f06f9a2c
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index af08de7704aab2aace7baabf9db2f3e0b1060845,ccb9a0f0aeea35bc3396a4083e9e635e29aa91db..b5e0bfba97249de96c07b30b0ee08a32e2638037
@@@ -1,1 -1,1 +1,1 @@@
- c253e276b29de28a18270d01b60d95157ce3fc4b37e246d991f9119d26e718d7
 -7e4c743f9e6ef33500795543e6db9a77c533025bf00c2ee97abd433a3871b5a1
++b6371ff9f5c3d4e87a5b1127a82970202f74c790b828dda20df88dd727bcc9b4