Do not do the byte-by-byte modifications in the resetdb.test script if the

reserved-byte flag in the DB header is non-zero, because in that case the
bytes will be in the wrong place and the test won't work.

FossilOrigin-Name: 0af18674ca5b34e67e1685be3adcdd99a7b8650589c6a7cde7ad9ef1852a8777

diff --git a/manifest b/manifest
index 51410694594900f02733f1b27f211a9fa45e2b6c..af39ddd2c138278d037a509121d72219d3a2892d 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sproblem\scausing\sENABLE_CURSOR_HINTS\sbuilds\sto\ssegfault.
-D 2018-09-11T13:38:35.239
+C Do\snot\sdo\sthe\sbyte-by-byte\smodifications\sin\sthe\sresetdb.test\sscript\sif\sthe\nreserved-byte\sflag\sin\sthe\sDB\sheader\sis\snon-zero,\sbecause\sin\sthat\scase\sthe\nbytes\swill\sbe\sin\sthe\swrong\splace\sand\sthe\stest\swon't\swork.
+D 2018-09-11T19:05:32.116
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 6b650013511fd9d8b094203ac268af9220d292cc7d4e1bc9fbca15aacd8c7995
@@ -1192,7 +1192,7 @@ F test/regexp1.test 497ea812f264d12b6198d6e50a76be4a1973a9d8
 F test/regexp2.test 40e894223b3d6672655481493f1be12012f2b33c
 F test/reindex.test 44edd3966b474468b823d481eafef0c305022254
 F test/releasetest.tcl 769892f81050b3f59c66f274d478d855159b474ea27019dec82f1215c0b91ef7 x
-F test/resetdb.test 2f928983dc7e9aca4042141712a1b9ab3ab9c290a824e13d612127154b3d056c
+F test/resetdb.test 684a6ffde5a5141bba79f3101981cc38dcfc3403f61e643b7b3aa68bef0b8408
 F test/resolver01.test f4022acafda7f4d40eca94dbf16bc5fc4ac30ceb
 F test/rollback.test 06680159bc6746d0f26276e339e3ae2f951c64812468308838e0a3362d911eaa
 F test/rollback2.test bc868d57899dc6972e2b4483faae0e03365a0556941474eec487ae21d8d38bb6
@@ -1765,7 +1765,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 74c381b573817d0212153278b5ee5d2238a27a727dcf7ee769365c47bb9fc40d
-R 0b832c5b0e713a61e9d4a331f9384f3d
-U dan
-Z d2d202690d7e886b87995c4fac3cf3bf
+P e7033104fa8bd974a9a3d173200aa07a3aa3daade86e7eb65cad5d00b086969e
+R 553e186251c37536e2e9d2df452440ce
+U drh
+Z 6be3f7f5ac979d895a8dce103831fd74

diff --git a/manifest.uuid b/manifest.uuid
index e18db981eafca2302a149852a899415cf1cdbdcf..9d30b6eecbd1a769c7927d84b7a1f9f1c34e340d 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e7033104fa8bd974a9a3d173200aa07a3aa3daade86e7eb65cad5d00b086969e
\ No newline at end of file
+0af18674ca5b34e67e1685be3adcdd99a7b8650589c6a7cde7ad9ef1852a8777
\ No newline at end of file

diff --git a/test/resetdb.test b/test/resetdb.test
index 3a10fc79d50e330625eb4bc2694dd2683cb57873..ab52d7dd384c2be606f89a10d2a359b7a5dd47b3 100644 (file)
--- a/test/resetdb.test
+++ b/test/resetdb.test
@@ -223,6 +223,11 @@ do_execsql_test 700 {
   PRAGMA integrity_check;
 } {19 ok}
 
+if {[nonzero_reserved_bytes]} {
+  finish_test
+  return
+}
+
 do_execsql_test 710 {
   UPDATE sqlite_dbpage SET data=
     X'53514C69746520666F726D61742033000200030100402020000000000000001300000000000000000000000300000004000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000D00000003017C0001D801AC017C00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002E03061715110145696E6465787431626374310443524541544520494E4445582074316263204F4E20743128622C63292A0206171311013F696E64657874316174310343524541544520494E44455820743161204F4E20743128612926010617111101397461626C657431743102435245415445205441424C4520743128612C622C6329' WHERE pgno=1;
@@ -244,4 +249,3 @@ do_execsql_test 740 {
 } {1 ok}
 
 finish_test
-