From: stephan <stephan@noemail.net>
Date: Sat, 28 Oct 2023 03:56:14 +0000 (+0000)
Subject: Merge trunk into jni-post-3.44 branch.
X-Git-Tag: version-3.45.0~232^2~1
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=793e872803be22ed6f30451b4194afb530dca024;p=thirdparty%2Fsqlite.git

Merge trunk into jni-post-3.44 branch.

FossilOrigin-Name: 9670eb2496b4005cf718d9fd12dbd11733f7cf6704a967ebb316504ea6a51e82
---

793e872803be22ed6f30451b4194afb530dca024
diff --cc ext/jni/src/c/sqlite3-jni.c
index 3ec0916b45,245ce4f9e9..6d54391e18
--- a/ext/jni/src/c/sqlite3-jni.c
+++ b/ext/jni/src/c/sqlite3-jni.c
@@@ -90,12 -90,12 +90,6 @@@
  #endif
  #endif
  
--/**********************************************************************/
--/* SQLITE_M... */
--#ifndef SQLITE_MAX_ALLOCATION_SIZE
--# define SQLITE_MAX_ALLOCATION_SIZE 0x1fffffff
--#endif
--
  /**********************************************************************/
  /* SQLITE_O... */
  #ifndef SQLITE_OMIT_DEPRECATED
diff --cc manifest
index 9a4dde3ead,7ee959d342..2040c8baa6
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Add\smissing\sdocs\sfor\sthe\sJS\sWorker1\sexport\smethod,\sas\spointed\sout\sin\s[forum:75524f7342|forum\spost\s75524f7342].
- D 2023-10-27T23:02:01.291
 -C Remove\sthe\sSQLITE_MAX_ALLOCATION_SIZE\sflag\s(set\sto\s536mb)\sfrom\sthe\sWASM\sand\sJNI\sbuilds\sbecause\sit\scan\sunduly\slimit\sdb\sexports\svia\ssqlite3_serialize(),\sas\sreported\sin\s[forum:75524f7342c1ba45|forum\spost\s75524f7342c1ba45].\sIt\snow\sdefaults\sto\swhatever\ssqlite3.c\suses,\swhich\sis\scurrently\sjust\sshy\sof\s2gb.
 -D 2023-10-28T03:54:28.627
++C Merge\strunk\sinto\sjni-post-3.44\sbranch.
++D 2023-10-28T03:56:14.902
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -236,11 -236,11 +236,11 @@@ F ext/fts5/tool/showfts5.tcl d54da0e067
  F ext/icu/README.txt 7ab7ced8ae78e3a645b57e78570ff589d4c672b71370f5aa9e1cd7024f400fc9
  F ext/icu/icu.c c074519b46baa484bb5396c7e01e051034da8884bad1a1cb7f09bbe6be3f0282
  F ext/icu/sqliteicu.h fa373836ed5a1ee7478bdf8a1650689294e41d0c89c1daab26e9ae78a32075a8
 -F ext/jni/GNUmakefile 5c3ac326bf3853486ebe0d70819abc790cc65c412182ce4ebd5012b008d9b059
 +F ext/jni/GNUmakefile 36919b7c4fb8447da4330df9996c7b064b766957f8b7be214a30eab55a8b8072
  F ext/jni/README.md ef9ac115e97704ea995d743b4a8334e23c659e5534c3b64065a5405256d5f2f4
  F ext/jni/jar-dist.make 030aaa4ae71dd86e4ec5e7c1e6cd86f9dfa47c4592c070d2e35157e42498e1fa
- F ext/jni/src/c/sqlite3-jni.c d6a71910c41f6de49fdd7b769b1b814e5ccdccc8bbda2897dcf61ff5fccf1f32
 -F ext/jni/src/c/sqlite3-jni.c 6f6df9657989e9ca2cfdcc2fe9a71c279de56d5c941adfd09a0f24256de35c8f
 -F ext/jni/src/c/sqlite3-jni.h b4c413a0d0c734683da1049cfcf89e35ae2719759d0656ec0f8c57188f18cab8
++F ext/jni/src/c/sqlite3-jni.c afe9c25b82279a28fe2c81f869070fa0d434b0a8ccd7f8aca0e8173db410d14a
 +F ext/jni/src/c/sqlite3-jni.h 1c45fd4689cec42f3d84d2fee41bb494016a12fcb5fd80291095590666a14015
  F ext/jni/src/org/sqlite/jni/annotation/NotNull.java a99341e88154e70447596b1af6a27c586317df41a7e0f246fd41370cd7b723b2
  F ext/jni/src/org/sqlite/jni/annotation/Nullable.java 0b1879852707f752512d4db9d7edd0d8db2f0c2612316ce1c832715e012ff6ba
  F ext/jni/src/org/sqlite/jni/annotation/package-info.java 977b374aed9d5853cbf3438ba3b0940abfa2ea4574f702a2448ee143b98ac3ca
@@@ -792,10 -791,10 +792,10 @@@ F src/upsert.c fa125a8d3410ce9a97b02cb5
  F src/utf.c ee39565f0843775cc2c81135751ddd93eceb91a673ea2c57f61c76f288b041a0
  F src/util.c b22cc9f203a8c0b9ee5338a67f8860347d14845864c10248bebe84518a781677
  F src/vacuum.c 604fcdaebe76f3497c855afcbf91b8fa5046b32de3045bab89cc008d68e40104
- F src/vdbe.c 300b1ac9339a5b7db9ccd48c1a13c3d71722da13352a38ee042ca0a399b4dd7e
+ 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/vdbeblob.c 13f9287b55b6356b4b1845410382d6bede203ceb29ef69388a4a3d007ffacbe5
  F src/vdbemem.c c936e9002af4993b84c4eb7133d6b1190efe46d391cc86117ecd67ba17b1a04b
@@@ -2137,8 -2139,8 +2140,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 7cb6d3cd3926882240c91a4b90fdf237b931653295d8d94b05ed885dcae59608
- R 53009930e6bc65b4da12fb26b9e7e080
 -P 72d7c18f80f41529811f74855ac198681a0cfe7634225233ec4b8df219c2e73b
 -R bf08c39748b4512d96281328ee8f10df
++P a7b267bd11216ee990cdd855044fbc18c300dff07cf25b317f27c1bbbc340dcc f6e1137919243c5ce86725df64b40b7e12e82cbceaff210ca41616d620f0dd1b
++R 624bf302e62c1cc32ad38a47599efaea
  U stephan
- Z 6e447e009637f07735108793303337a5
 -Z 7196c1c2248d91eedb16eedfc74c5151
++Z e297eea85124209717df39b3b4767cd9
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index cddb3f9f7d,b2dd4e2f35..4d5592d9bf
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- a7b267bd11216ee990cdd855044fbc18c300dff07cf25b317f27c1bbbc340dcc
 -f6e1137919243c5ce86725df64b40b7e12e82cbceaff210ca41616d620f0dd1b
++9670eb2496b4005cf718d9fd12dbd11733f7cf6704a967ebb316504ea6a51e82