diff options
| author | drh <drh@noemail.net> | 2015-07-14 15:39:22 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2015-07-14 15:39:22 +0000 |
| commit | 38151adfe2f51c07ca50e9cbc6f44a9811097eb1 (patch) | |
| tree | 44ecb68858c63553a92e23f56db4481f7a620327 /src/malloc.c | |
| parent | bed6de557a5282f92ed5019d5c89129a6ece6bab (diff) | |
| parent | 201e0c68f7d5d19ba759f56fadd0d58c838c41f9 (diff) | |
| download | sqlite-38151adfe2f51c07ca50e9cbc6f44a9811097eb1.tar.gz sqlite-38151adfe2f51c07ca50e9cbc6f44a9811097eb1.zip | |
Merge trunk changes, including the addition of FTS5 and pcache1 performance
enhancements.
FossilOrigin-Name: db4cbefb8674c6cfff27c1e918741de1885c845c
Diffstat (limited to 'src/malloc.c')
| -rw-r--r-- | src/malloc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/malloc.c b/src/malloc.c index 97b9cd577..1e77734ec 100644 --- a/src/malloc.c +++ b/src/malloc.c @@ -193,10 +193,9 @@ int sqlite3MallocInit(void){ sqlite3GlobalConfig.nScratch = 0; } if( sqlite3GlobalConfig.pPage==0 || sqlite3GlobalConfig.szPage<512 - || sqlite3GlobalConfig.nPage<1 ){ + || sqlite3GlobalConfig.nPage<=0 ){ sqlite3GlobalConfig.pPage = 0; sqlite3GlobalConfig.szPage = 0; - sqlite3GlobalConfig.nPage = 0; } rc = sqlite3GlobalConfig.m.xInit(sqlite3GlobalConfig.m.pAppData); if( rc!=SQLITE_OK ) memset(&mem0, 0, sizeof(mem0)); |