archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-19 17:04:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Upgrade bundled libsqlite to 2.8.9

Browse source
This commit is contained in:
Ilia Alshanetsky 2004-01-08 14:25:01 +00:00
parent 2cf3cb6407
commit a4ea8eb44e
37 changed files with 5000 additions and 6182 deletions
Download patch file Download diff file Expand all files Collapse all files

19
ext/sqlite/libsqlite/src/btree.c
View file

@ -471,8 +471,10 @@ static int allocateSpace(Btree *pBt, MemPage *pPage, int nByte){
FreeBlk *p;
u16 *pIdx;
int start;
int cnt = 0;
int iSize;
#ifndef NDEBUG
int cnt = 0;
#endif
assert( sqlitepager_iswriteable(pPage) );
assert( nByte==ROUNDUP(nByte) );
@ -1400,7 +1402,9 @@ static int moveToChild(BtCursor *pCur, int newPgno){
sqlitepager_unref(pCur->pPage);
pCur->pPage = pNewPage;
pCur->idx = 0;
if( pNewPage->nCell<1 ) return SQLITE_CORRUPT;
if( pNewPage->nCell<1 ){
return SQLITE_CORRUPT;
}
return SQLITE_OK;
}
@ -3155,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. */
};
@ -3167,10 +3169,10 @@ static void checkAppendMsg(IntegrityCk *pCheck, char *zMsg1, char *zMsg2){
if( pCheck->zErrMsg ){
char *zOld = pCheck->zErrMsg;
pCheck->zErrMsg = 0;
sqliteSetString(&pCheck->zErrMsg, zOld, "\n", zMsg1, zMsg2, 0);
sqliteSetString(&pCheck->zErrMsg, zOld, "\n", zMsg1, zMsg2, (char*)0);
sqliteFree(zOld);
}else{
sqliteSetString(&pCheck->zErrMsg, zMsg1, zMsg2, 0);
sqliteSetString(&pCheck->zErrMsg, zMsg1, zMsg2, (char*)0);
}
}
@ -3401,11 +3403,6 @@ static int checkTreePage(
}
#endif
/* Update freespace totals.
*/
pCheck->nTreePage++;
pCheck->nByte += USABLE_SPACE - pPage->nFree;
sqlitepager_unref(pPage);
return depth;
}