From: drh <>
Date: Thu, 29 Jul 2021 17:01:44 +0000 (+0000)
Subject: Fix an error in one of the assert() statements added by [23b08fe9db24a953].
X-Git-Tag: version-3.37.0~309^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=944d85dfe23b12d7055c0e4452f8b5d99c1906a9;p=thirdparty%2Fsqlite.git

Fix an error in one of the assert() statements added by [23b08fe9db24a953].

FossilOrigin-Name: ad24334bc06dc9ae52825a1873a1eab6c258d77fcc00dec55884ddddecd9932e
---

diff --git a/manifest b/manifest
index 120bb226b7..8846c82ec0 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Minor\stweaks\sto\svarious\sTCL\sbuild\sscripts\sso\sthat\sthey\swork\seven\sfor\sTCL\s8.4,\nwhich\sis\sobsolete,\sbut\sis\salso\sall\sthat\sis\savailable\sfor\ssome\slegacy\splatforms.
-D 2021-07-29T16:49:28.900
+C Fix\san\serror\sin\sone\sof\sthe\sassert()\sstatements\sadded\sby\s[23b08fe9db24a953].
+D 2021-07-29T17:01:44.518
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -628,7 +628,7 @@ F src/vdbetrace.c 666c6fd9f1b62be6999e072a45b913e3c2c3518bc60dfd4d54fe304130acb7
 F src/vdbevtab.c f99b275366c5fc5e2d99f734729880994ab9500bdafde7fae3b02d562b9d323c
 F src/vtab.c 3a9a6ae1fd14f7c00af184233cb9f3bced89ae277a75a312f85fb77297a3cdfa
 F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
-F src/wal.c 1b1e7311d3f12ab60c012734e49ebf048d6eeb4485b6f077bd79f340e9c36731
+F src/wal.c ce589eddfba84f9f89e789d08ea5ffe9e85454cbbfaba8fd42a258e3e08cf5e5
 F src/wal.h c3aa7825bfa2fe0d85bef2db94655f99870a285778baa36307c0a16da32b226a
 F src/walker.c 7342becedf3f8a26f9817f08436bdf8b56ad69af83705f6b9320a0ad3092c2ac
 F src/where.c 07c63dde6ab72477b964f4c81bee61ef78a246ca149bb9a560784f2e85cd78d7
@@ -1920,7 +1920,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 23b08fe9db24a953cc231b093cf74d140c9965d22964d0401ff8ab3d4ecba443
-R 7cc2835397664c86246e99abe4a64984
+P 2269ce64f707c4a198fcb9a72933648ea61a80b4251024b8058ff28ad81b4917
+R d8e804ce8738bf098491021b76160220
 U drh
-Z 6820ddb47fc7506cf54e2e30c650a734
+Z 804b14c8c136144aca6d8b2088fe3d7f
diff --git a/manifest.uuid b/manifest.uuid
index dd5cdfac06..81ebe7246f 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2269ce64f707c4a198fcb9a72933648ea61a80b4251024b8058ff28ad81b4917
\ No newline at end of file
+ad24334bc06dc9ae52825a1873a1eab6c258d77fcc00dec55884ddddecd9932e
\ No newline at end of file
diff --git a/src/wal.c b/src/wal.c
index 4b1d63e8d0..ce9394d156 100644
--- a/src/wal.c
+++ b/src/wal.c
@@ -1433,7 +1433,8 @@ int sqlite3WalOpen(
   assert( 32768 ==  WALINDEX_PGSZ        );
   assert(     8 ==  SQLITE_SHM_NLOCK     );
   assert(     5 ==  WAL_NREADER          );
-  assert(    24 ==  WAL_HDRSIZE          );
+  assert(    24 ==  WAL_FRAME_HDRSIZE    );
+  assert(    32 ==  WAL_HDRSIZE          );
   assert(   120 ==  WALINDEX_LOCK_OFFSET + WAL_WRITE_LOCK   );
   assert(   121 ==  WALINDEX_LOCK_OFFSET + WAL_CKPT_LOCK    );
   assert(   122 ==  WALINDEX_LOCK_OFFSET + WAL_RECOVER_LOCK );