Remove unused code from the integrity_check logic. Ticket #545. (CVS 1153)

FossilOrigin-Name: ee51e205fb6ef412db6a46077e8bc1554aadcca1

diff --git a/manifest b/manifest
index 10e126598e6c340102f3fbf7ea5bf054a27ea242..126671933b9ba2f5cbd20128e994af158054920d 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sbug\sin\sthe\sSQLITE_PROFILE\sconditional\scompilation.\s(CVS\s1152)
-D 2003-12-31T17:57:11
+C Remove\sunused\scode\sfrom\sthe\sintegrity_check\slogic.\s\sTicket\s#545.\s(CVS\s1153)
+D 2004-01-01T12:33:43
 F Makefile.in 0515ff9218ad8d5a8f6220f0494b8ef94c67013b
 F Makefile.linux-gcc b86a99c493a5bfb402d1d9178dcdc4bd4b32f906
 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
@@ -23,7 +23,7 @@ F sqlite.1 83f4a9d37bdf2b7ef079a82d54eaf2e3509ee6ea
 F sqlite.pc.in 30552343140c53304c2a658c080fbe810cd09ca2
 F src/attach.c 9a3764bbccb1c8b39321630006fbaa0fb8bd1822
 F src/auth.c c59ad0dab501888f8b1fccc25e2f5965d2265116
-F src/btree.c 89a77be5ca8bb229f9e230de534098ea5b06c2c1
+F src/btree.c 9ab30f0504ef69ba4cba2f264d8096c5abc2b7b8
 F src/btree.h 9b7c09f1e64274d7bb74a57bbfc63778f67b1048
 F src/btree_rb.c e4084b6a12270674b0cd7034655f55e6a2639c78
 F src/build.c a7493c433de5b552f9535d8fa7ed80aaf135491e
@@ -179,7 +179,7 @@ F www/speed.tcl 2f6b1155b99d39adb185f900456d1d592c4832b3
 F www/sqlite.tcl 3c83b08cf9f18aa2d69453ff441a36c40e431604
 F www/tclsqlite.tcl b9271d44dcf147a93c98f8ecf28c927307abd6da
 F www/vdbe.tcl 9b9095d4495f37697fd1935d10e14c6015e80aa1
-P 458cfa5ba82f2d676e398437a4b1d26d77582d10
-R b980ec76c7ec657224f75a4c68144d8e
+P 597b33f696c0cde84529cd06a8f95a8ccc8f1e8e
+R 6fc771048b85c788ec8a93bdefbc0ab5
 U drh
-Z aea9e91ef67be7707f7bac1602611fde
+Z 15be029d265569e940521d0e79e32463

diff --git a/manifest.uuid b/manifest.uuid
index 6763d418fb8f4b25595290e38a7eadaaa49958f3..e9e099eeec5df4a936cb6e7c916a36df7ac175ab 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-597b33f696c0cde84529cd06a8f95a8ccc8f1e8e
\ No newline at end of file
+ee51e205fb6ef412db6a46077e8bc1554aadcca1
\ No newline at end of file

diff --git a/src/btree.c b/src/btree.c
index a61511ee2b682f104d781b8d9fcda962295406bb..68ef483cbdbadc1a504842110846d5220012546e 100644 (file)
--- a/src/btree.c
+++ b/src/btree.c
@@ -9,7 +9,7 @@
 **    May you share freely, never taking more than you give.
 **
 *************************************************************************
-** $Id: btree.c,v 1.97 2003/12/16 03:44:48 drh Exp $
+** $Id: btree.c,v 1.98 2004/01/01 12:33:43 drh Exp $
 **
 ** This file implements a external (disk-based) database using BTrees.
 ** For a detailed discussion of BTrees, refer to
@@ -3159,8 +3159,6 @@ struct IntegrityCk {
   Pager *pPager; /* The associated pager.  Also accessible by pBt->pPager */
   int nPage;     /* Number of pages in the database */
   int *anRef;    /* Number of times each page is referenced */
-  int nTreePage; /* Number of BTree pages */
-  int nByte;     /* Number of bytes of data stored on BTree pages */
   char *zErrMsg; /* An error message.  NULL of no errors seen. */
 };
 
@@ -3405,11 +3403,6 @@ static int checkTreePage(
   }
 #endif
 
-  /* Update freespace totals.
-  */
-  pCheck->nTreePage++;
-  pCheck->nByte += USABLE_SPACE - pPage->nFree;
-
   sqlitepager_unref(pPage);
   return depth;
 }