From: stephan <stephan@noemail.net>
Date: Sat, 19 Aug 2023 12:34:23 +0000 (+0000)
Subject: Merge trunk into jni-threading branch.
X-Git-Tag: version-3.44.0~305^2~19
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6f92f35449d752d87aae48638e18be6fcebbbf6c;p=thirdparty%2Fsqlite.git

Merge trunk into jni-threading branch.

FossilOrigin-Name: 8254479c6ff1ea3cc9e56de1698db8405c03da90b9bf4c401182e47e0842baf8
---

6f92f35449d752d87aae48638e18be6fcebbbf6c
diff --cc ext/jni/GNUmakefile
index 699d5aaf25,1be4c04439..0bb3bec441
--- a/ext/jni/GNUmakefile
+++ b/ext/jni/GNUmakefile
@@@ -163,11 -163,14 +163,11 @@@ SQLITE_OPT = 
    -DSQLITE_OMIT_LOAD_EXTENSION \
    -DSQLITE_OMIT_DEPRECATED \
    -DSQLITE_OMIT_SHARED_CACHE \
 -  -DSQLITE_THREADSAFE=0 \
 +  -DSQLITE_THREADSAFE=1 \
    -DSQLITE_TEMP_STORE=2 \
    -DSQLITE_USE_URI=1 \
-   -DSQLITE_C=$(sqlite3.c) \
-   -DSQLITE_DEBUG
+   -DSQLITE_C=$(sqlite3.c)
+ #  -DSQLITE_DEBUG
 -# -DSQLITE_DEBUG is just to work around a -Wall warning
 -# for a var which gets set in all builds but only read
 -# via assert().
  
  SQLITE_OPT += -g -DDEBUG -UNDEBUG
  
diff --cc manifest
index 560dbc569e,fd7b8258af..7a9e3a9c76
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C JNI\sdoc\sadditions.
- D 2023-08-19T12:32:00.131
 -C shell.c.in\shelp\stext\stypo\sfix.\sNo\sfunctional\schanges.
 -D 2023-08-19T08:12:10.152
++C Merge\strunk\sinto\sjni-threading\sbranch.
++D 2023-08-19T12:34:23.970
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -231,11 -232,11 +232,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 ace719d6d7025a0a454b7c661de2beef9a0e819535ad0ce0742034da8ff8d27f
 -F ext/jni/GNUmakefile 3deba6bc0bf37c1ee5f15d1ff3c3512ae2f3cf44a2b8ae7b4af92690514b0cb4
 -F ext/jni/README.md 5c60e4580aa5c94ff74d7bef1fb6231e578f7764e831a07b5981b6ab62b35560
 -F ext/jni/jar-dist.make 93da95f8fe01ef22fccacc27f2e805938058e91e8c72c0532558d3a812a42e74
 -F ext/jni/src/c/sqlite3-jni.c bea6b8691a5fa3a8626a771757bb261208d3c5fc6598266d3b0ee23d88e35632
 -F ext/jni/src/c/sqlite3-jni.h 28565de9efc971195c684095ba0d184b90401290698c987f7ea3f54e47ff4f2f
++F ext/jni/GNUmakefile 4849b0ac41c3a92777aebf0ec3d51c2be7c78d3ea9b91ece03ade6f9fa13d99a
 +F ext/jni/README.md 975b35173debbbf3a4ab7166e14d2ffa2bacff9b6850414f09cc919805e81ba4
 +F ext/jni/jar-dist.make 9a03d10dbb5a74c724bfec4b76fd9e4c9865cbbc858d731cb48f38ac897d73a3
 +F ext/jni/src/c/sqlite3-jni.c 8608cb36223d6bc64e8ddd9296b6d63a4fc54efaf8dbc3ea7e5eca81f4801d42
 +F ext/jni/src/c/sqlite3-jni.h f10d2f38720687c70ecdd5e44f6e8db98efee2caa05fc86b2d9e0c76e6cc0a18
  F ext/jni/src/org/sqlite/jni/Authorizer.java 1308988f7f40579ea0e4deeaec3c6be971630566bd021c31367fe3f5140db892
  F ext/jni/src/org/sqlite/jni/AutoExtension.java 18e83f6f463e306df60b2dceb65247d32af1f78af4bbbae9155411a8c6cdb093
  F ext/jni/src/org/sqlite/jni/BusyHandler.java 1b1d3e5c86cd796a0580c81b6af6550ad943baa25e47ada0dcca3aff3ebe978c
@@@ -2091,8 -2092,8 +2092,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 e202b6e69da8cced114d027cf2e91a04dfdd50b601b3274214783f7d750c558c
- R 109361c70c87f2804d75b9c237ee841f
 -P c48f1be8cc505a7e2902c79e26c1d9a121ff5c55785ac812d2e09232b2414695
 -R b8bc869b8d758cc2a2e67811c6189c81
++P 0c7ac34f30e1f7e35a2ac4e5e55e5f24857b24afa81a7abecba60f1c9c68b9ff c319033276c3565d0f1f2cae1c91791940d322fe79696bc26d74fddeb2664373
++R 35896553571ede397fc34e5af8e0e6bc
  U stephan
- Z 56d27110aeccda606f4b75566f7a0870
 -Z 43d19bb1ac563f29cc01181a73eccbfe
++Z 1f979ceda0d0b798d0ca7e29bc8a0301
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index a2e0dd926c,c2202fbeeb..aaad1b3cae
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 0c7ac34f30e1f7e35a2ac4e5e55e5f24857b24afa81a7abecba60f1c9c68b9ff
 -c319033276c3565d0f1f2cae1c91791940d322fe79696bc26d74fddeb2664373
++8254479c6ff1ea3cc9e56de1698db8405c03da90b9bf4c401182e47e0842baf8