From: larrybr <larrybr@noemail.net>
Date: Sun, 24 Sep 2023 19:47:37 +0000 (+0000)
Subject: Merge expert changes to accept UDFs and custom collations.
X-Git-Tag: version-3.44.0~57^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e5adfb1a5fd0e4e174299e5208419fe7e2d703f8;p=thirdparty%2Fsqlite.git

Merge expert changes to accept UDFs and custom collations.

FossilOrigin-Name: 8ead1b5ed6693c0e3c30428033049c95a1fe636d1d1eff1734d0a896b5ff1f5a
---

e5adfb1a5fd0e4e174299e5208419fe7e2d703f8
diff --cc manifest
index 6f9c608067,3b345a2c70..b7f4ea1c64
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Resolve\sthe\sJNI\sFTS5\stest5()\sfailure\sand\sremove\ssome\snearby\sdead\scode.
- D 2023-09-24T19:13:31.100
 -C Add\sminimal\sexercise\sof\sexpert\sacceptance\sof\sUDFs\sand\scustom\scollations.
 -D 2023-09-24T19:38:22.270
++C Merge\sexpert\schanges\sto\saccept\sUDFs\sand\scustom\scollations.
++D 2023-09-24T19:47:37.560
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -2121,8 -2121,8 +2121,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 b5edea16317ccc896394011f45442af44d5ea1041b6abfe152c90412c78bfc5b
- R e953b1803753c8b191ad714c0d30fec2
- U stephan
- Z 3ee8d5bd34ec986d01785356a75c837f
 -P 2d290854cd9b6cef70b53c28745e1ccee5b5443378407bfc726e452e7e7a0a95
++P 5655c51f103c6dfade799ffb5ca2eb21b4360ada598741f373c952ae732535aa 0f6bbb79cbb52f5ddf38840898ab6789a4e108353918296df20b332117e6a148
+ R 3a0526e4c02c825c8cc29dc1d63531db
+ U larrybr
 -Z 980eed3593ae76a9a7a9bc23a9306c16
++Z a1c976c0a741d8b5b62201d4f47baf77
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index c67f420d3c,037dc02929..35f1f4c99d
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 5655c51f103c6dfade799ffb5ca2eb21b4360ada598741f373c952ae732535aa
 -0f6bbb79cbb52f5ddf38840898ab6789a4e108353918296df20b332117e6a148
++8ead1b5ed6693c0e3c30428033049c95a1fe636d1d1eff1734d0a896b5ff1f5a