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

Merge recent trunk changes into the threads branch.

Browse Source 
FossilOrigin-Name: 163c247bd8280ab14fe577329c631c8bd884707f
This commit is contained in:
drh
2014-07-28 15:01:37 +00:00
parent ac65196e4d e6bc1ef68f
commit 966d9f267f
10 changed files with 239 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/btree.c
View File

@@ -1632,7 +1632,7 @@ static Pgno btreePagecount(BtShared *pBt){
u32 sqlite3BtreeLastPage(Btree *p){
assert( sqlite3BtreeHoldsMutex(p) );
assert( ((p->pBt->nPage)&0x8000000)==0 );
return (int)btreePagecount(p->pBt);
return btreePagecount(p->pBt);
}
/*