From: drh <>
Date: Fri, 1 Nov 2024 09:50:26 +0000 (+0000)
Subject: Merge the readonly-ignore-wal-jrnl enhancement into the reuse-schema branch,
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7fd8520e6244d6e23f49de9d778704c98ae21b9b;p=thirdparty%2Fsqlite.git

Merge the readonly-ignore-wal-jrnl enhancement into the reuse-schema branch,
so that it can be found there in all future releases.  Other recent trunk
enhancements are also part of that change and are merged as well.

FossilOrigin-Name: 4e4885a067523d1d7ae67af00414e1beb430b16e150b6d07025645528b2d0da6
---

7fd8520e6244d6e23f49de9d778704c98ae21b9b
diff --cc manifest
index 60cee5511d,c6e42891db..1201000359
--- a/manifest
+++ b/manifest
@@@ -1,11 -1,11 +1,11 @@@
- C Merge\sthe\slatest\strunk\senhancements\sinto\sthe\sreuse-schema\sbranch.
- D 2024-10-25T20:21:57.974
 -C Update\sthis\sbranch\sso\sthat\sit\sworks\swith\sZipVFS.
 -D 2024-10-31T15:59:29.175
++C Merge\sthe\sreadonly-ignore-wal-jrnl\senhancement\sinto\sthe\sreuse-schema\sbranch,\nso\sthat\sit\scan\sbe\sfound\sthere\sin\sall\sfuture\sreleases.\s\sOther\srecent\strunk\nenhancements\sare\salso\spart\sof\sthat\schange\sand\sare\smerged\sas\swell.
++D 2024-11-01T09:50:26.266
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
- F LICENSE.md b6e6c1baf38e4339bd3f1e0e5e5bfd0a9a93d133360691b2785c2d4b2f2dcec2
- F Makefile.in 5a95c68b70be1448a6f226c09c1df5e338cc496e70987173fcfdca9ad94cb5a4
- F Makefile.linux-generic 8df0e6ee5e4671f844caf27f88d2be7421e904639f7a0ffdce0e2cd4ea11e8c0 w Makefile.linux-gcc
- F Makefile.msc d9deac6e98e27a29ceb2b22e5cc069e90039fb5128ade945e100422f1d07a2ff
+ F LICENSE.md c5b4009dca54d127d2d6033c22fd9cc34f53bedb6ef12c7cbaa468381c74ab28
+ F Makefile.in c938c6f4febb0c5d63870bf9f6f8c43e5b20f3e1cfc889460d340add94d40db3
+ F Makefile.linux-generic bd3e3cacd369821a6241d4ea1967395c962dfe3057e38cb0a435cee0e8b789d0
+ F Makefile.msc 382cbcfd8470f07eb722a5ed3d82e4a4b7292f23c2e09a52b65b23d38231d969
  F README.md c3c0f19532ce28f6297a71870f3c7b424729f0e6d9ab889616d3587dd2332159
  F VERSION 8dc0c3df15fd5ff0622f88fc483533fce990b1cbb2f5fb9fdfb4dbd71eef2889
  F art/icon-243x273.gif 9750b734f82fdb3dc43127753d5e6fbf3b62c9f4e136c2fbf573b2f57ea87af5
@@@ -47,9 -47,9 +47,9 @@@ F autosetup/cc-lib.tcl 493c5935b5dd3bf9
  F autosetup/cc-shared.tcl 4f024e94a47f427ba61de1739f6381ef0080210f9fae89112d5c1de1e5460d78
  F autosetup/cc.tcl 7e2fe943ae9d45cf39e9f5b05b6230df8e719415edea5af06c30eb68680bde14
  F autosetup/default.auto 5cdf016de2140e50f1db190a02039dc42fb390af1dda4cc4853e3042a9ef0e82
- F autosetup/hwaci-common.tcl 97b55f68dd190e624340ced9c2de16286edad9db95fede4a184af4249561b4bb
  F autosetup/jimsh0.c 27ea5f221359ef6c58780fc6c185aadbf8d3bee9a021331a3e5de0eba0dc6de6
  F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba
 -F autosetup/proj.tcl fa96b17f000042f467239f2ef3e7a33d4787bc0fb5db4e69bd5bf1e55bb380f4
++F autosetup/proj.tcl fa96b17f000042f467239f2ef3e7a33d4787bc0fb5db4e69bd5bf1e55bb380f4 w autosetup/hwaci-common.tcl
  F autosetup/system.tcl 3a39d6e0b3bfba526fd39afe07c1d0d325e5a31925013a1ba7c671e1128e31bb
  F autosetup/tmake.auto eaebc74ad538dfdd3c817c27eefc31930c20510c4f3a3704071f6cb0629ed71f
  F autosetup/tmake.tcl a275793ec1b6f8708179af0acef1f6f10d46c2920739743f7a8720c6d700c7a9
@@@ -2226,29 -2210,8 +2210,9 @@@ F tool/version-info.c 3b36468a90faf1bbd
  F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
  F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- F vsixtest/App.xaml b76d3b48860e7454775c47ea38ffea9c4abe3e85
- F vsixtest/App.xaml.cpp 41158ee43269820136fa3bba00c0bd91b26cc38b650ee392aec2a8d823e54318
- F vsixtest/App.xaml.h 4a9768e2983d05600ad1e1c2f1b00a132967da9f
- F vsixtest/Assets/LockScreenLogo.scale-200.png e820c9a3deb909197081b0bf3216c06e13905f0a
- F vsixtest/Assets/SplashScreen.scale-200.png cab70988ca71bebec7bfeb3b6dbafe17b9ab0b4a
- F vsixtest/Assets/Square150x150Logo.scale-200.png e17b40817db7a239fc239d83efcc951fb824e3ff
- F vsixtest/Assets/Square44x44Logo.scale-200.png 2f166237094dea94d952d10b9eeae81806844f1c
- F vsixtest/Assets/Square44x44Logo.targetsize-24_altform-unplated.png 5f6a6d391b95a3061ccca6e6fdd6955ede63b4ed
- F vsixtest/Assets/StoreLogo.png 0828b7257db74a4ecd5eeb6b7b4971f0fdc4d9d1
- F vsixtest/Assets/Wide310x150Logo.scale-200.png 04ddefe5bc5f43ae12a7433f6f236ddab101ac42
- F vsixtest/MainPage.xaml 34f49897e3ca533a7e74506ba0759b66eebce151
- F vsixtest/MainPage.xaml.cpp 7f31fc6de751b64676c0924c97a5485d950a91d7
- F vsixtest/MainPage.xaml.h cc05cca10d50a003f6c6e4448b701cdd07f52f29
- F vsixtest/Package.appxmanifest 6b6db1eb7df3a315c5d681059754d5f0e0c47a93
- F vsixtest/pch.cpp cb823cfac36f1a39a7eb0acbd7e9a0b0de8f23af
- F vsixtest/pch.h 9cab7980f2ac4baa40807d8b5e52af32a21cf78c
- F vsixtest/vsixtest.sln 77cadbe4e96c1fe1bf51cd77de9e9b0a12ada547
- F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080bb302912
- F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
- F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
- F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P d49d28279539e8c82e401e35fa0b687c9b84c45a4f7ab2fa8d60cb20146c8f77 c4da7fa279274e5a6fe214b5c22f17bcf9b40299aeeab5bfbdae2ba0b2de6af0
- R dffee085c2773d37ad76cd25ffb032ca
 -P 67087fe433ff1d1bdae913becd908658cc03d61556c408091b640d0161a5edca bc71b0a0b3ca7506efa5e700bb23968d4ed2d82b8f1ce04a6bdcad7b7edc56b0
++P 12fc5fd5e0ec539faf6d0965096e20c2eea1c0cf5fe9704f8f1479a37b10a333 68eb7a64d0ac177c3421b0b107059f8db582f972bbafb3ea718ab81969ebf420
+ R eb2d93f65f416bf50bf51013f79b5896
++T +closed 68eb7a64d0ac177c3421b0b107059f8db582f972bbafb3ea718ab81969ebf420
  U drh
- Z 955a50ee8d8622ad9013c7c7742773f6
 -Z 287b8108032d5839a92369107bec4370
++Z e15b96d712795de36515216402b7b089
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 1d110f8645,a7e0951991..d9618bd07a
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 12fc5fd5e0ec539faf6d0965096e20c2eea1c0cf5fe9704f8f1479a37b10a333
 -68eb7a64d0ac177c3421b0b107059f8db582f972bbafb3ea718ab81969ebf420
++4e4885a067523d1d7ae67af00414e1beb430b16e150b6d07025645528b2d0da6