diff options
| author | dan <dan@noemail.net> | 2010-07-23 15:41:47 +0000 |
|---|---|---|
| committer | dan <dan@noemail.net> | 2010-07-23 15:41:47 +0000 |
| commit | 1feeaed291512a25e668b22d2cb89320f154fe67 (patch) | |
| tree | 0ff2245ec05f6aedede0d9a0f59f1e44187e37d3 /src/select.c | |
| parent | 1dcb9df43f6f94ec7cc42798c111817d67fe9d91 (diff) | |
| download | sqlite-1feeaed291512a25e668b22d2cb89320f154fe67.tar.gz sqlite-1feeaed291512a25e668b22d2cb89320f154fe67.zip | |
Remove the Table.dbMem variable, as it is no longer being used for its original purpose.
FossilOrigin-Name: 6eddc6e601cf8f585c6c2cf79f36fcbfe98a307e
Diffstat (limited to 'src/select.c')
| -rw-r--r-- | src/select.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/select.c b/src/select.c index b03e50638..3008276a7 100644 --- a/src/select.c +++ b/src/select.c @@ -1300,14 +1300,13 @@ Table *sqlite3ResultSetOfSelect(Parse *pParse, Select *pSelect){ /* The sqlite3ResultSetOfSelect() is only used n contexts where lookaside ** is disabled, so we might as well hard-code pTab->dbMem to NULL. */ assert( db->lookaside.bEnabled==0 ); - pTab->dbMem = 0; pTab->nRef = 1; pTab->zName = 0; selectColumnsFromExprList(pParse, pSelect->pEList, &pTab->nCol, &pTab->aCol); selectAddColumnTypeAndCollation(pParse, pTab->nCol, pTab->aCol, pSelect); pTab->iPKey = -1; if( db->mallocFailed ){ - sqlite3DeleteTable(pTab); + sqlite3DeleteTable(db, pTab); return 0; } return pTab; @@ -3096,7 +3095,6 @@ static int selectExpander(Walker *pWalker, Select *p){ sqlite3WalkSelect(pWalker, pSel); pFrom->pTab = pTab = sqlite3DbMallocZero(db, sizeof(Table)); if( pTab==0 ) return WRC_Abort; - pTab->dbMem = db->lookaside.bEnabled ? db : 0; pTab->nRef = 1; pTab->zName = sqlite3MPrintf(db, "sqlite_subquery_%p_", (void*)pTab); while( pSel->pPrior ){ pSel = pSel->pPrior; } |