database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-08 14:02:16 +03:00
Code Activity

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

Browse Source 
FossilOrigin-Name: cb3e12372d96f5a24f5a5d79645c705775bc63ff
This commit is contained in:
drh
2004-09-27 12:20:52 +00:00
parent 10e8266b91
commit 3127653b1c
3 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
manifest
View File

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

2
manifest.uuid
View File

@@ -1 +1 @@
54ee1664aaaa1a3380009b5206a0fa79cd286fc5 cb3e12372d96f5a24f5a5d79645c705775bc63ff

5
src/btree.c
View File

@@ -9,7 +9,7 @@
** May you share freely, never taking more than you give. ** 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. ** This file implements a external (disk-based) database using BTrees.
** For a detailed discussion of BTrees, refer to ** 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 ); assert( pBt->pPager!=0 );
aData = sqlite3pager_lookup(pBt->pPager, pgno); aData = sqlite3pager_lookup(pBt->pPager, pgno);
if( aData ){ if( aData ){
pThis = (MemPage*)&aData[pBt->usableSize]; pThis = (MemPage*)&aData[pBt->pageSize];
assert( pThis->aData==aData );
if( pThis->isInit ){ if( pThis->isInit ){
if( pThis->pParent!=pNewParent ){ if( pThis->pParent!=pNewParent ){
if( pThis->pParent ) sqlite3pager_unref(pThis->pParent->aData); if( pThis->pParent ) sqlite3pager_unref(pThis->pParent->aData);