Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Suppress a couple uninitialized variable warnings. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
29571e228cc85f7768c3ad57d0c7af96 |
| User & Date: | drh 2010-06-26 20:00:54 |
Context
|
2010-06-26
| ||
| 20:25 | Fix two asserts on the scratch allocator to allow for up to two outstanding scratch allocations per thread. check-in: f149b498 user: drh tags: trunk | |
| 20:00 | Suppress a couple uninitialized variable warnings. check-in: 29571e22 user: drh tags: trunk | |
| 19:03 | Add test file tkt-d11f09d36e.test. check-in: 6e469b63 user: dan tags: trunk | |
Changes
Changes to src/pager.c.
4834 4835 4836 4837 4838 4839 4840 4841 4842 4843 4844 4845 4846 4847 4848 |
PgHdr *pPg = pDbPage;
Pager *pPager = pPg->pPager;
Pgno nPagePerSector = (pPager->sectorSize/pPager->pageSize);
if( nPagePerSector>1 ){
Pgno nPageCount; /* Total number of pages in database file */
Pgno pg1; /* First page of the sector pPg is located on. */
int nPage; /* Number of pages starting at pg1 to journal */
int ii; /* Loop counter */
int needSync = 0; /* True if any page has PGHDR_NEED_SYNC */
/* Set the doNotSyncSpill flag to 1. This is because we cannot allow
** a journal header to be written between the pages journaled by
** this function.
*/
|
| |
4834 4835 4836 4837 4838 4839 4840 4841 4842 4843 4844 4845 4846 4847 4848 |
PgHdr *pPg = pDbPage;
Pager *pPager = pPg->pPager;
Pgno nPagePerSector = (pPager->sectorSize/pPager->pageSize);
if( nPagePerSector>1 ){
Pgno nPageCount; /* Total number of pages in database file */
Pgno pg1; /* First page of the sector pPg is located on. */
int nPage = 0; /* Number of pages starting at pg1 to journal */
int ii; /* Loop counter */
int needSync = 0; /* True if any page has PGHDR_NEED_SYNC */
/* Set the doNotSyncSpill flag to 1. This is because we cannot allow
** a journal header to be written between the pages journaled by
** this function.
*/
|
Changes to src/wal.c.
1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 |
ht_slot *aList; /* Pointer to sub-list content */
};
const int nList = *pnList; /* Size of input list */
int nMerge; /* Number of elements in list aMerge */
ht_slot *aMerge; /* List to be merged */
int iList; /* Index into input list */
int iSub; /* Index into aSub array */
struct Sublist aSub[13]; /* Array of sub-lists */
memset(aSub, 0, sizeof(aSub));
assert( nList<=HASHTABLE_NPAGE && nList>0 );
assert( HASHTABLE_NPAGE==(1<<(ArraySize(aSub)-1)) );
for(iList=0; iList<nList; iList++){
|
| |
1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 |
ht_slot *aList; /* Pointer to sub-list content */
};
const int nList = *pnList; /* Size of input list */
int nMerge; /* Number of elements in list aMerge */
ht_slot *aMerge; /* List to be merged */
int iList; /* Index into input list */
int iSub = 0; /* Index into aSub array */
struct Sublist aSub[13]; /* Array of sub-lists */
memset(aSub, 0, sizeof(aSub));
assert( nList<=HASHTABLE_NPAGE && nList>0 );
assert( HASHTABLE_NPAGE==(1<<(ArraySize(aSub)-1)) );
for(iList=0; iList<nList; iList++){
|