diff options
| author | drh <drh@noemail.net> | 2015-07-23 21:59:58 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2015-07-23 21:59:58 +0000 |
| commit | 244c8d7077ea25763bf2efce123da2f7d2d811cc (patch) | |
| tree | 76ee15618f861fe989e7b16dfaca84bb121f35a3 /src/main.c | |
| parent | 38151adfe2f51c07ca50e9cbc6f44a9811097eb1 (diff) | |
| parent | cfb8f8d6a9073040e90f0bf502f4b108d7917433 (diff) | |
| download | sqlite-244c8d7077ea25763bf2efce123da2f7d2d811cc.tar.gz sqlite-244c8d7077ea25763bf2efce123da2f7d2d811cc.zip | |
Merge all changes in the latest 3.8.11 beta into the sessions branch.
Changes include the rename of OTA to RBU, the WITHOUT-ROWID-OR-Skipscan fix,
and improvements to pcache1.
FossilOrigin-Name: 7f0ee77062d2fcb014942c7c62c163ccc801f21b
Diffstat (limited to 'src/main.c')
| -rw-r--r-- | src/main.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/main.c b/src/main.c index addb3987f..d0545ccf1 100644 --- a/src/main.c +++ b/src/main.c @@ -642,6 +642,7 @@ int sqlite3_config(int op, ...){ ** the lookaside memory. */ static int setupLookaside(sqlite3 *db, void *pBuf, int sz, int cnt){ +#ifndef SQLITE_OMIT_LOOKASIDE void *pStart; if( db->lookaside.nOut ){ return SQLITE_BUSY; @@ -692,6 +693,7 @@ static int setupLookaside(sqlite3 *db, void *pBuf, int sz, int cnt){ db->lookaside.bEnabled = 0; db->lookaside.bMalloced = 0; } +#endif /* SQLITE_OMIT_LOOKASIDE */ return SQLITE_OK; } |