]> git.ipfire.org Git - thirdparty/sqlite.git/commitdiff
Merge the latest trunk enhancements, including fix for assert() failure in fts5,...
authordan <Dan Kennedy>
Mon, 30 Sep 2024 17:32:08 +0000 (17:32 +0000)
committerdan <Dan Kennedy>
Mon, 30 Sep 2024 17:32:08 +0000 (17:32 +0000)
FossilOrigin-Name: ab6356181274016571124989bc10e16256666567bb284612a0a689cf18a50adb

1  2 
manifest
manifest.uuid

diff --cc manifest
index 9dbbe65453a21860b5d97985f130df1173dc7d58,77ea93c2618b0f11b35cbf108f68d7df1410d7c5..a905d8f55be6ba06cf42c7bf102bca554c5e0357
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\sthe\slatest\strunk\senhancements\sinto\sthe\swal2\sbranch.
- D 2024-09-30T14:41:43.466
 -C In\sfts5,\savoid\sstarting\sa\snew\smerge\sof\slevel\sL\sif\sthere\sexists\salready\san\songoing\smerge\sof\sa\slevel\sless\sthan\sL.
 -D 2024-09-30T17:28:45.511
++C Merge\sthe\slatest\strunk\senhancements,\sincluding\sfix\sfor\sassert()\sfailure\sin\sfts5,\sinto\sthe\swal2\sbranch.
++D 2024-09-30T17:32:08.647
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -613,8 -611,8 +613,8 @@@ F ext/wasm/SQLTester/SQLTester.mjs ce76
  F ext/wasm/SQLTester/SQLTester.run.mjs c72b7fe2072d05992f7a3d8c6a1d34e95712513ceabe40849784e24e41c84638
  F ext/wasm/SQLTester/index.html 3f8a016df0776be76605abf20e815ecaafbe055abac0e1fe5ea080e7846b760d
  F ext/wasm/SQLTester/touint8array.c 2d5ece04ec1393a6a60c4bf96385bda5e1a10ad49f3038b96460fc5e5aa7e536
 -F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-core 2bcbbfe3b95c043ed6037e2708a2ee078d212dd1612c364f93588d8dc97300fe
 +F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api c5eaceabb9e759aaae7d3101a4a3e542f96ab2c99d89a80ce20ec18c23115f33
- F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-extras fe40d6d758646e38f8b15f709044951e10884214f5453d35502100179c388c13 w ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-session
+ F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-extras fe40d6d758646e38f8b15f709044951e10884214f5453d35502100179c388c13
  F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-see fb29e62082a658f0d81102488414d422c393c4b20cc2f685b216bc566237957b
  F ext/wasm/api/EXPORTED_RUNTIME_METHODS.sqlite3-api 1ec3c73e7d66e95529c3c64ac3de2470b0e9e7fbf7a5b41261c367cf4f1b7287
  F ext/wasm/api/README.md 34fe11466f9c1d81b10a0469e1114e5f1c5a6365c73d80a1a6ca639a1a358b73
@@@ -2227,8 -2213,8 +2227,8 @@@ F vsixtest/vsixtest.tcl 6195aba1f12a5e1
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P f3e3ad6945647c88f41748b5e8ce71c06d6e77ac67c607898af63ea14a91910b 76b6331e6a705a420a64820a18214f07cf4c1d5151e7158d6fff09964e63f352
- R 05954f9ee2d57c423f6fbd200beffeb9
- U drh
- Z cd4585e5bcd92750853e4602e3256f18
 -P 76b6331e6a705a420a64820a18214f07cf4c1d5151e7158d6fff09964e63f352
 -R af602edd5730d15273eb424f12f293da
++P 0f9e2fceecdb7fad0a2528a4244a786d17274d11b83f336d6012420675a2e4cd 350c6e75ce3c1e81458d1baa73045df489284206e8b279ab3c2f5e3d011c262a
++R cb26b1a66669f9ba73a72b529dcc5094
+ U dan
 -Z 7c2ca47bd5a0ad794a2bc7691bf0167e
++Z 6f705badf675793272d3710bf9fc6490
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 6bb373246a0e5a9dd7d7a340cc84823f4ba3f69f,35fff3b926f94a33349193662e394af745e58cc6..acd7fc61f62479c6de9a50f43c8b8a087a14fed5
@@@ -1,1 -1,1 +1,1 @@@
- 0f9e2fceecdb7fad0a2528a4244a786d17274d11b83f336d6012420675a2e4cd
 -350c6e75ce3c1e81458d1baa73045df489284206e8b279ab3c2f5e3d011c262a
++ab6356181274016571124989bc10e16256666567bb284612a0a689cf18a50adb