database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-05 15:55:57 +03:00
Code Activity

Fixes so that compiling and testing works when SQLITE_OMIT_AUTOVACUUM is defined. (CVS 2218)

Browse Source 
FossilOrigin-Name: fe548561a0e7a696fd453372f4427cf3e3f19d20
This commit is contained in:
danielk1977
2005-01-16 09:06:33 +00:00
parent 79a40da6d7
commit 4e17d14c63
9 changed files with 50 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/btree.c
View File

@@ -9,7 +9,7 @@
** May you share freely, never taking more than you give.
**
*************************************************************************
** $Id: btree.c,v 1.235 2005/01/16 08:00:01 danielk1977 Exp $
** $Id: btree.c,v 1.236 2005/01/16 09:06:34 danielk1977 Exp $
**
** This file implements a external (disk-based) database using BTrees.
** For a detailed discussion of BTrees, refer to
@@ -3726,7 +3726,7 @@ static int balance_nonroot(MemPage *pPage){
int *szCell; /* Local size of all cells in apCell[] */
u8 *aCopy[NB]; /* Space for holding data of apCopy[] */
u8 *aSpace; /* Space to hold copies of dividers cells */
#ifndef SQLITE_OMIT_VACUUM
#ifndef SQLITE_OMIT_AUTOVACUUM
u8 *aFrom = 0;
#endif
@@ -4227,7 +4227,6 @@ static int balance_shallower(MemPage *pPage){
int mxCellPerPage; /* Maximum number of cells per page */
u8 **apCell; /* All cells from pages being balanced */
int *szCell; /* Local size of all cells */
int i;
assert( pPage->pParent==0 );
assert( pPage->nCell==0 );
@@ -4357,6 +4356,7 @@ static int balance_deeper(MemPage *pPage){
zeroPage(pPage, pChild->aData[0] & ~PTF_LEAF);
put4byte(&pPage->aData[pPage->hdrOffset+8], pgnoChild);
TRACE(("BALANCE: copy root %d into %d\n", pPage->pgno, pChild->pgno));
#ifndef SQLITE_OMIT_AUTOVACUUM
if( pBt->autoVacuum ){
int i;
rc = ptrmapPut(pBt, pChild->pgno, PTRMAP_BTREE, pPage->pgno);
@@ -4368,6 +4368,7 @@ static int balance_deeper(MemPage *pPage){
}
}
}
#endif
rc = balance_nonroot(pChild);
releasePage(pChild);
return rc;