Bug fix in btree.c in cases where usableSize!=pageSize. Ticket #925. (CVS 1987)

FossilOrigin-Name: cb3e12372d96f5a24f5a5d79645c705775bc63ff

diff --git a/manifest b/manifest
index 932a3e657bbf7cc011b8b60dd698a2acf9545b30..49bc485ba30acebafeac6ae106ac74d2f129b131 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\sunused\sCLUSTER\skeyword\sfrom\sthe\sparser.\s(CVS\s1986)
-D 2004-09-25T15:29:09
+C Bug\sfix\sin\sbtree.c\sin\scases\swhere\susableSize!=pageSize.\s\sTicket\s#925.\s(CVS\s1987)
+D 2004-09-27T12:20:52
 F Makefile.in abdeb5bd9d017822691884935c320037c33f6ee6
 F Makefile.linux-gcc a9e5a0d309fa7c38e7c14d3ecf7690879d3a5457
 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
@@ -28,7 +28,7 @@ F sqlite3.def dbaeb20c153e1d366e8f421b55a573f5dfc00863
 F sqlite3.pc.in 985b9bf34192a549d7d370e0f0b6b34a4f61369a
 F src/attach.c e49d09dad9f5f9fb10b4b0c1be5a70ae4c45e689
 F src/auth.c 65408baa7e6621520882478dfa1e6b8c1d6c1850
-F src/btree.c 470e00b08688f065c2e62a6dcd3fb18880e8e309
+F src/btree.c 839aa4dbb742b518dff6c833b5edf259649f2c5f
 F src/btree.h 94dfec0a1722d33359b23e7e310f2b64ffedf029
 F src/build.c 86318bdcd291919d4f87700385fdb73146436531
 F src/date.c eb8d5fa1a6d5cfc09031c8852d10ff742a94b15b
@@ -247,7 +247,7 @@ F www/tclsqlite.tcl 560ecd6a916b320e59f2917317398f3d59b7cc25
 F www/vdbe.tcl 59288db1ac5c0616296b26dce071c36cb611dfe9
 F www/version3.tcl 092a01f5ef430d2c4acc0ae558d74c4bb89638a0
 F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4
-P 26898c57cb2419d4200803f79fdd821c3093cba2
-R 1239f899169b9ff5d2e07cdedb7e4bed
+P 54ee1664aaaa1a3380009b5206a0fa79cd286fc5
+R 4007cebb122e47fc348aee0870d3a991
 U drh
-Z b3c88a3708ed8786afd87bcb59e7ea82
+Z eff0734cd4f698ab257de3d7b60fd084

diff --git a/manifest.uuid b/manifest.uuid
index b616946a5cd2fd653383dacd8e50842421ec6f89..923a3c51d06788bcf8d5c88a20e6f04c40bd9962 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-54ee1664aaaa1a3380009b5206a0fa79cd286fc5
\ No newline at end of file
+cb3e12372d96f5a24f5a5d79645c705775bc63ff
\ No newline at end of file

diff --git a/src/btree.c b/src/btree.c
index 548c7577a92155b96581b309d6abd0af57a7ea39..81b6f48bacfb331fe610f4fc68263982928ab4c7 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.189 2004/09/08 20:13:05 drh Exp $
+** $Id: btree.c,v 1.190 2004/09/27 12:20:52 drh Exp $
 **
 ** This file implements a external (disk-based) database using BTrees.
 ** For a detailed discussion of BTrees, refer to
@@ -2668,7 +2668,8 @@ static void reparentPage(Btree *pBt, Pgno pgno, MemPage *pNewParent, int idx){
   assert( pBt->pPager!=0 );
   aData = sqlite3pager_lookup(pBt->pPager, pgno);
   if( aData ){
-    pThis = (MemPage*)&aData[pBt->usableSize];
+    pThis = (MemPage*)&aData[pBt->pageSize];
+    assert( pThis->aData==aData );
     if( pThis->isInit ){
       if( pThis->pParent!=pNewParent ){
         if( pThis->pParent ) sqlite3pager_unref(pThis->pParent->aData);