diff options
| author | dan <dan@noemail.net> | 2011-09-19 11:57:34 +0000 |
|---|---|---|
| committer | dan <dan@noemail.net> | 2011-09-19 11:57:34 +0000 |
| commit | 73ac46da31d1579105686096251de75b87dc69df (patch) | |
| tree | 275c9bee82dff03f645508531e1e11d4b4130743 /src | |
| parent | 168f9f5aa3df20453a0239d971ebb99f6bb5da59 (diff) | |
| download | sqlite-73ac46da31d1579105686096251de75b87dc69df.tar.gz sqlite-73ac46da31d1579105686096251de75b87dc69df.zip | |
Remove a stray merge-sort related change from pager.c and pager.h.
FossilOrigin-Name: 69823ed163049d6fa1e24a9810c3c99f2a8fdd46
Diffstat (limited to 'src')
| -rw-r--r-- | src/pager.c | 2 | ||||
| -rw-r--r-- | src/pager.h | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/src/pager.c b/src/pager.c index f40d2af74..f8d3ba998 100644 --- a/src/pager.c +++ b/src/pager.c @@ -620,7 +620,6 @@ struct Pager { u8 tempFile; /* zFilename is a temporary file */ u8 readOnly; /* True for a read-only database */ u8 memDb; /* True to inhibit all file I/O */ - u8 hasSeenStress; /* pagerStress() called one or more times */ /************************************************************************** ** The following block contains those class members that change during @@ -4175,7 +4174,6 @@ static int pagerStress(void *p, PgHdr *pPg){ ** be called in the error state. Nevertheless, we include a NEVER() ** test for the error state as a safeguard against future changes. */ - pPager->hasSeenStress = 1; if( NEVER(pPager->errCode) ) return SQLITE_OK; if( pPager->doNotSpill ) return SQLITE_OK; if( pPager->doNotSyncSpill && (pPg->flags & PGHDR_NEED_SYNC)!=0 ){ diff --git a/src/pager.h b/src/pager.h index 2a02eff75..eab7ddaf8 100644 --- a/src/pager.h +++ b/src/pager.h @@ -60,7 +60,6 @@ typedef struct PgHdr DbPage; #define PAGER_OMIT_JOURNAL 0x0001 /* Do not use a rollback journal */ #define PAGER_NO_READLOCK 0x0002 /* Omit readlocks on readonly files */ #define PAGER_MEMORY 0x0004 /* In-memory database */ -#define PAGER_SORTER 0x0020 /* Accumulator in external merge sort */ /* ** Valid values for the second argument to sqlite3PagerLockingMode(). |