Use "-encoding iso8859-1" instead of "-encoding binary" in mjournal.test so that...

FossilOrigin-Name: 897b443fb35d550891315890a5af473d347af3b6ecea11fcafafb5b06a1b50a5

diff --git a/manifest b/manifest
index 40985f6094ea45d3e5f392297ba0df15b8cf9ac1..92d92545d121e5a7d4eeca50898915cebe9f383e 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\spotential\s1\sbyte\soverwrite\sthat\scould\soccur\swhen\sprocessing\sa\scarefully\scrafted\ssuper-journal\sfile.
-D 2026-05-25T17:58:07.602
+C Use\s"-encoding\siso8859-1"\sinstead\sof\s"-encoding\sbinary"\sin\smjournal.test\sso\sthat\sthe\sscript\sworks\swith\sboth\sTcl\s8\sand\s9.
+D 2026-05-25T18:14:58.294
 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@ -1448,7 +1448,7 @@ F test/misc6.test 953cc693924d88e6117aeba16f46f0bf5abede91
 F test/misc7.test d595599972ec0b436985f0f02f243b68500ffc977b9b3194ec66c0866cfddcab
 F test/misc8.test 08d2380bc435486b12161521f225043ac2be26f02471c2c1ea4cac0b1548edbd
 F test/misuse.test 859f37014d9824ca66bd90c36372c08c80c51c9593a7cfa8a31d4f92cd4d5b7f
-F test/mjournal.test 9606ade3f291302c4a50f8fbfc977ac8b16dd4ad239a737ed97f02f6f2c0df57
+F test/mjournal.test dcee98981209630e158537ea340501388cb57b7a56e806dee3128202432bee0a
 F test/mmap1.test 18de3fd7b70a777af6004ca2feecfcdd3d0be17fa04058e808baf530c94b1a1d
 F test/mmap2.test dba452dc7db91e9df10f70bdd73dc4190c7b8ee7b5133b4684f04277ada0b9ac
 F test/mmap3.test b3c297e78e6a8520aafcc1a8f140535594c9086e
@@ -2207,8 +2207,8 @@ F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee
 F tool/warnings.sh a554d13f6e5cf3760f041b87939e3d616ec6961859c3245e8ef701d1eafc2ca2
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
 F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c
-P de009593f692251c4a033742b1e79c4ddb5ddcb174209d58c4d1bea19ceb360c
-R a0c5e5c803d4365d84ed98f177450d6b
+P b3766c3afd0ac4d31f158ee5938f19d72a047872e422b5f19b1567c60640f54d
+R 68491f627fa8594d873043b14a1150c2
 U dan
-Z d74b62e05bd609b4ff5189dd06f78521
+Z 5b697bd95f0c1528a1b9895f7511a4f8
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 860ad1659fcbf664370de189b7a3006309322181..ce2706dcfeb036adefb3653a7b1e3b223e73f6a0 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b3766c3afd0ac4d31f158ee5938f19d72a047872e422b5f19b1567c60640f54d
+897b443fb35d550891315890a5af473d347af3b6ecea11fcafafb5b06a1b50a5

diff --git a/test/mjournal.test b/test/mjournal.test
index 7c9451792952e62ee8d15c48e130fd63c2e5b8fb..c7c12c7d6c340f741194058e48f75f804f5a1420 100644 (file)
--- a/test/mjournal.test
+++ b/test/mjournal.test
@@ -185,7 +185,7 @@ do_test 3.2 {
   set cksum 0
   foreach b $bytes { incr cksum $b }
   set fd [open test.db-journal a+]
-  fconfigure $fd -translation binary -encoding binary
+  fconfigure $fd -translation binary -encoding iso8859-1
   puts -nonewline $fd $mjname
   puts -nonewline $fd [binary format I [string length $mjname]]
   puts -nonewline $fd [binary format I $cksum]
@@ -195,14 +195,14 @@ do_test 3.2 {
   # Create super-journal
   #
   set fd [open test.db-super w]
-  fconfigure $fd -translation binary -encoding binary
+  fconfigure $fd -translation binary -encoding iso8859-1
   puts -nonewline $fd "test2.db-journal\0test.db-journal\0"
   close $fd
 
   # Create corrupt child journal
   #
   set fd [open test2.db-journal w]
-  fconfigure $fd -translation binary -encoding binary
+  fconfigure $fd -translation binary -encoding iso8859-1
   puts -nonewline $fd [binary decode hex "00200001[string repeat 41 512]"]
   puts -nonewline $fd [binary decode hex "0000020000008200d9d505f920a163d7"]
   close $fd