From: stephan <stephan@noemail.net>
Date: Thu, 2 Nov 2023 18:08:49 +0000 (+0000)
Subject: Merge latest JNI pieces into trunk.
X-Git-Tag: version-3.45.0~232
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=06af40b2e1730669342122db14eab2e83588e1d5;p=thirdparty%2Fsqlite.git

Merge latest JNI pieces into trunk.

FossilOrigin-Name: e8c97faec339430fa2d1a7e915050d9b363bdba606a4419397cb099141da254d
---

06af40b2e1730669342122db14eab2e83588e1d5
diff --cc manifest
index df7a5eb535,1ad5acd831..5b857bc608
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C One\smore\stweak\sto\stool/srctree-check.tcl\sso\sthat\sa\scomplete\sbuild\scan\sbe\naccomplished\sfrom\sa\sread-only\ssource\stree.
- D 2023-11-02T13:10:16.285
 -C Remove\ssome\soutdated\sJNI\sdocs.
 -D 2023-11-01T20:09:02.325
++C Merge\slatest\sJNI\spieces\sinto\strunk.
++D 2023-11-02T18:08:49.759
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -794,8 -795,8 +795,8 @@@ F src/vacuum.c 604fcdaebe76f3497c855afc
  F src/vdbe.c 14479441337135eed8e290fb1d4abb7db657d93217a3b1ea8a2f031d3895536a
  F src/vdbe.h 41485521f68e9437fdb7ec4a90f9d86ab294e9bb8281e33b235915e29122cfc0
  F src/vdbeInt.h 949669dfd8a41550d27dcb905b494f2ccde9a2e6c1b0b04daa1227e2e74c2b2c
- F src/vdbeapi.c fe654b1f54e1feebcaed6c2ae3ed035cc65bfeb9a1169bed866abc42bfc63ff6
+ F src/vdbeapi.c db190d007bdf5b9165edeb12369f4c59a459f88fd652c1671c1238862e662cc3
 -F src/vdbeaux.c 929a4edecf9845fb063b47b23b9d187473a648470d915521cf72419f5219c4b7
 +F src/vdbeaux.c dffcf79e7e415fcd6e4c8ac1ec7124cae5257018443adf09551c807655b04993
  F src/vdbeblob.c 13f9287b55b6356b4b1845410382d6bede203ceb29ef69388a4a3d007ffacbe5
  F src/vdbemem.c c936e9002af4993b84c4eb7133d6b1190efe46d391cc86117ecd67ba17b1a04b
  F src/vdbesort.c 237840ca1947511fa59bd4e18b9eeae93f2af2468c34d2427b059f896230a547
@@@ -2139,8 -2140,8 +2140,9 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P 58eb5440d75fb13c1a089cb935de6fb94b4322e10e349db8f11f37b9a2fda2fc
- R 18054cea9bc23d801f864db646273e7d
- U drh
- Z 72328c40506425c913ea7fab75e23b19
 -P 9670eb2496b4005cf718d9fd12dbd11733f7cf6704a967ebb316504ea6a51e82
 -R 97a2b4ce6a38c0f0d2c6b5ea82f2a285
++P cba9f0601ca995ac6952aa3a83f7264f6d25aaaa2ea36b19e90cbf591077de72 52aef3d015bad12c4bd9334ec795276a68a0dabdc6fd0ff2a1068f640171eb77
++R 68a7c8f334cdcfec330ab8b9d0fb1419
++T +closed 52aef3d015bad12c4bd9334ec795276a68a0dabdc6fd0ff2a1068f640171eb77 Closed\sby\sintegrate-merge.
+ U stephan
 -Z 679d5351cf0eeba3692c3f5d2e6b7df2
++Z 2b85b199bb49bc244763d72014a1c5d4
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 7142949e45,56e74409bd..649b037ed4
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- cba9f0601ca995ac6952aa3a83f7264f6d25aaaa2ea36b19e90cbf591077de72
 -52aef3d015bad12c4bd9334ec795276a68a0dabdc6fd0ff2a1068f640171eb77
++e8c97faec339430fa2d1a7e915050d9b363bdba606a4419397cb099141da254d