Merge trunk into cygwin-fixes branch. 'make test' failure count = 1 (delete_db-1...

FossilOrigin-Name: 7471088197e647d5fc9eded332cc2ae35bb38fa8c62f948057e1ab89ed25bb42

diff --cc autosetup/sqlite-config.tcl
index bcfa7ed53f54181f0aac8a4c482142e572899088,1df6e233ff48f12a0fdbff812fa2ea7d891f9cff..afcad4c4f538d565275182a6d55af5b1840906fe
--- 1/autosetup/sqlite-config.tcl
--- 2/autosetup/sqlite-config.tcl
+++ b/autosetup/sqlite-config.tcl
@@@ -450,14 -464,10 +464,14 @@@ proc sqlite-configure-phase1 {buildMode
    }
    set ::sqliteConfig(msg-debug-enabled) [proj-val-truthy [get-env msg-debug 0]]
    proc-debug "msg-debug is enabled"
-   sqlite-autoreconfig
+   proj-setup-autoreconfig SQLITE_AUTORECONFIG
    proj-file-extensions
    if {".exe" eq [get-define TARGET_EXEEXT]} {
 -    define SQLITE_OS_UNIX 0
 +    if {$::tcl_platform(platform) eq "unix"} {
 +      define SQLITE_OS_UNIX 1
 +    } else {
 +      define SQLITE_OS_UNIX 0
 +    }
      define SQLITE_OS_WIN 1
    } else {
      define SQLITE_OS_UNIX 1

diff --cc manifest
index 0656488ea7fcdaa21112635f9debc4ac01ebc8fa,37b79aec84a4f14c4f133abafe7adf31bb8d94c0..472df476814103e92b60b62f5d6b7154e55f7fb9
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\strunk
- D 2025-04-04T13:25:04.854
 -C Enhance\ssqlite3_rsync\sso\sthat\sif\sthe\sfirst\sattempt\sto\sinvoke\sa\scopy\nof\sitself\son\sthe\sremote\ssystem\susing\sssh\sfails,\stry\sagain\safter\naugmenting\sthe\sPATH.\s\sThis\senables\ssqlite3_rsync\sto\swork\swithout\sthe\n--exe\soption\swhen\sthe\sremote\ssystem\sis\sa\sMac.
 -D 2025-05-03T15:17:21.853
++C Merge\strunk\sinto\scygwin-fixes\sbranch.\s'make\stest'\sfailure\scount\s=\s1\s(delete_db-1.3.0)\sboth\sbefore\sand\safter\sthe\smerge,
++D 2025-05-05T15:12:23.997
  F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@@ -49,10 -49,10 +49,10 @@@ F autosetup/cc-lib.tcl 493c5935b5dd3bf9
  F autosetup/cc-shared.tcl 4f024e94a47f427ba61de1739f6381ef0080210f9fae89112d5c1de1e5460d78
  F autosetup/cc.tcl c0fcc50ca91deff8741e449ddad05bcd08268bc31177e613a6343bbd1fd3e45f
  F autosetup/find_tclconfig.tcl e64886ffe3b982d4df42cd28ed91fe0b5940c2c5785e126c1821baf61bc86a7e
- F autosetup/jimsh0.c a57c16e65dcffc9c76e496757cb3f7fb47e01ecbd1631a0a5e01751fc856f049
+ F autosetup/jimsh0.c 563b966c137a4ce3c9333e5196723b7ac0919140a9d7989eb440463cd855c367
  F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba
- F autosetup/proj.tcl 89b1822a66b4d6a286c959b3c26093e35926bf86db56cc1887ddcb130001f76a
- F autosetup/sqlite-config.tcl 168b787d872d1d72e0772ac91e1c27cdb0fb2ae59cfb0b15326132ec18ef1ca9
+ F autosetup/proj.tcl 0287234d817e800ab0e10d46bf98545ba5762edd69e5dd0e2902029a7e6c3555
 -F autosetup/sqlite-config.tcl 7ff986f6c3951f3aec5608522cbf772d8d04a0d26cc894289e2ca4836e018719
++F autosetup/sqlite-config.tcl 6ad961af65494f5617ea58052a128fc8ba7527594bb8ccc76fcd52fce7cdae79
  F autosetup/system.tcl 51d4be76cd9a9074704b584e5c9cbba616202c8468cf9ba8a4f8294a7ab1dba9
  F configure 9a00b21dfd13757bbfb8d89b30660a89ec1f8f3a79402b8f9f9b6fc475c3303a x
  F contrib/sqlitecon.tcl eb4c6578e08dd353263958da0dc620f8400b869a50d06e271ab0be85a51a08d3
@@@ -745,10 -745,10 +745,10 @@@ F src/hash.c 73934a7f7ab1cb110614a9388c
  F src/hash.h 46b92795a95bfefb210f52f0c316e9d7cdbcdd7e7fcfb0d8be796d3a5767cddf
  F src/hwtime.h f9c2dfb84dce7acf95ce6d289e46f5f9d3d1afd328e53da8f8e9008e3b3caae6
  F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
- F src/insert.c a5f0366266be993ebf533808f22cb7a788624805b55bc45424ceed3f48c54a16
- F src/json.c fbae43c3920110be8d5307003d37d2b85b9bfb6d6d70fcb56ab68204026141af
+ F src/insert.c d05934dfab2c5c0c480fc6fd2038f11215661de08ea6ff38d2563216bd555c1b
+ F src/json.c c84b0f2bae967341d5a035808d21d0619b23b6e054ceac08e7592cd87f04ed4f
  F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
 -F src/loadext.c 7432c944ff197046d67a1207790a1b13eec4548c85a9457eb0896bb3641dfb36
 +F src/loadext.c 4cde2939fab9a640d8123882a81309543267edbcd78b1fba1697475a39557488
  F src/main.c 07f78d917ffcdf327982840cfd8e855fd000527a2ea5ace372ce4febcbd0bf97
  F src/malloc.c 410e570b30c26cc36e3372577df50f7a96ee3eed5b2b161c6b6b48773c650c5e
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
@@@ -779,9 -779,9 +779,9 @@@ F src/parse.y e426d7323311554c75b0aebc4
  F src/pcache.c 588cc3c5ccaaadde689ed35ce5c5c891a1f7b1f4d1f56f6cf0143b74d8ee6484
  F src/pcache.h 1497ce1b823cf00094bb0cf3bac37b345937e6f910890c626b16512316d3abf5
  F src/pcache1.c 131ca0daf4e66b4608d2945ae76d6ed90de3f60539afbd5ef9ec65667a5f2fcd
 -F src/pragma.c 30b535d0a66348df844ee36f890617b4cf45e9a22dcbc47ec3ca92909c50aaf1
 +F src/pragma.c d53aae3c33d5e482fcb66b159e6d8c138d1a414e1621e76d3ab665701eb50277
  F src/prepare.c 1832be043fce7d489959aae6f994c452d023914714c4d5457beaed51c0f3d126
- F src/printf.c 33fc0d7643c848a098afdcb6e1db6de12379d47084b1cd0912cfce1d09345e44
+ F src/printf.c 3b91c334f528359145f4dde0dedd945bbb21044d0825ea064934d7222d61662c
  F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
  F src/resolve.c 20e1fbe8f840ffc0cd835e33f68a802a22e34faa918d7a269f3de242fda02f99
  F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
@@@ -1734,8 -1734,8 +1734,8 @@@ F test/temptable2.test 76821347810ecc88
  F test/temptable3.test d11a0974e52b347e45ee54ef1923c91ed91e4637
  F test/temptrigger.test 38f0ca479b1822d3117069e014daabcaacefffcc
  F test/tester.tcl 463ae33b8bf75ac77451df19bd65e7c415c2e9891227c7c9e657d0a2d8e1074a
- F test/testrunner.tcl 228732ca62ea60e97785e13528bd36627cf3c115d59364a5181ed7f85fd0031d x
- F test/testrunner_data.tcl 8f3f62ff2a694d46e5673df6a757a427ce737a6705d67b30ec2d140715f9f122
+ F test/testrunner.tcl 614c4a28f7f730acd7bec53e17d76602fb480e0d538b6ec548169e03a093f92d x
 -F test/testrunner_data.tcl 8d5fa3851c48bc94e26db0be325202e44f6ca4ed838272b8d5b10c23817621e6
++F test/testrunner_data.tcl 9a39183050a6a61cb7ff369fa47472ac4d7c99bc475b1a1dcd2fd2781ed683be
  F test/thread001.test a0985c117eab62c0c65526e9fa5d1360dd1cac5b03bde223902763274ce21899
  F test/thread002.test c24c83408e35ba5a952a3638b7ac03ccdf1ce4409289c54a050ac4c5f1de7502
  F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7
@@@ -2160,10 -2159,9 +2159,9 @@@ F tool/mkmsvcmin.tcl d76c45efda1cce2d40
  F tool/mkopcodec.tcl 33d20791e191df43209b77d37f0ff0904620b28465cca6990cf8d60da61a07ef
  F tool/mkopcodeh.tcl 2b4e6967a670ef21bf53a164964c35c6163277d002a4c6f56fa231d68c88d023
  F tool/mkopts.tcl 680f785fdb09729fd9ac50632413da4eadbdf9071535e3f26d03795828ab07fa
 -F tool/mkpragmatab.tcl 3801ce32f8c55fe63a3b279f231fb26c2c1a2ea9a09d2dd599239d87a609acec
 +F tool/mkpragmatab.tcl 5615f8ea9ae6990b73da765c5f121117cbc2a5197b65bed25c56f71c7ab2f42a
  F tool/mkshellc.tcl 9ce74de0fa904a2c56a96f8d8b5261246bacb0eaa8d7e184f9e18ff94145ebbc
  F tool/mksourceid.c 36aa8020014aed0836fd13c51d6dc9219b0df1761d6b5f58ff5b616211b079b9
- F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
  F tool/mksqlite3c-noext.tcl 351c55256213154cabb051a3c870ef9f4487de905015141ae50dc7578a901b84
  F tool/mksqlite3c.tcl f11b63445c4840509248bd4aa151a81aea25d5415fef71943c8d436eba4f3b3c
  F tool/mksqlite3h.tcl 989948c6a26e188e673d7c2f2f093ea3acd816ad6ac65bab596280075c8f3a45
@@@ -2216,8 -2207,8 +2207,8 @@@ F tool/version-info.c 3b36468a90faf1bbd
  F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
  F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 79dfaf05b81a5d83042251429ec97d6f3d6a596965ac345a9112f174d6447ee6 32ef3f26e7fb34dfdb23617a19bb9baa2e4c3dca564a88850b58a0fbe6446cf8
- R 94fc1dae596561509520ba3a4ec99696
- U jan.nijtmans
- Z d5cd01cf9b829dbba3a0a9e923ea0e7e
 -P f8f15eff6ae50d569ed13a3b18f33eaa43453c0cb80b6007df38e880b62f45d0
 -R 92ec366dcda46ad4e89bcad267e1732a
 -U drh
 -Z 6f2331f004388e224b4ac4ea1a14b67b
++P 436a01e1b13e1fdb2d4d45b8614853cc2b3c2a1fbfe68a08984e15a50178cf3e 38d4c94d8c7802101ef3bfb411002f9497fdbbbd2b4d3514cef5b76ffd66f75b
++R d1ccc667b09749eeff7f48f4cc07e941
++U stephan
++Z c15ef88cc3a3f27e705aadd23b503983
  # Remove this line to create a well-formed Fossil manifest.

diff --cc manifest.uuid
index 4ab11a0eb8d0ec813142a8ffb55abd778a20aeb8,f3c2df3c41c1b4bf9f53dcc360b2ce18fb58101f..5bfcd62ee7d893d65880b07356d126c2551cb25f
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 436a01e1b13e1fdb2d4d45b8614853cc2b3c2a1fbfe68a08984e15a50178cf3e
 -38d4c94d8c7802101ef3bfb411002f9497fdbbbd2b4d3514cef5b76ffd66f75b
++7471088197e647d5fc9eded332cc2ae35bb38fa8c62f948057e1ab89ed25bb42

diff --cc test/testrunner_data.tcl
Simple merge