diff options
author | drh <drh@noemail.net> | 2016-03-07 17:49:17 +0000 |
---|---|---|
committer | drh <drh@noemail.net> | 2016-03-07 17:49:17 +0000 |
commit | c5c67abb9ab2c58d41f75a41a1693e4b30e00bd5 (patch) | |
tree | 27752830b165d06e6980a19a1a95291599818886 /src/pager.c | |
parent | 2606aca80f35c4672c7834e90786d737679fa35b (diff) | |
parent | 8c71a98ce13ce3169e6533dd05fce3c2cac2926a (diff) | |
download | sqlite-c5c67abb9ab2c58d41f75a41a1693e4b30e00bd5.tar.gz sqlite-c5c67abb9ab2c58d41f75a41a1693e4b30e00bd5.zip |
Merge the virtual table query planner enhancement, the RTREE cost estimate
fix, and the statement journal spill delay enhancement from trunk.
FossilOrigin-Name: 17fd8f3cf0ec565e08403dc8e10a1cffc2bbe165
Diffstat (limited to 'src/pager.c')
-rw-r--r-- | src/pager.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/pager.c b/src/pager.c index c74748c8e..f045ce0ef 100644 --- a/src/pager.c +++ b/src/pager.c @@ -4358,11 +4358,11 @@ static int openSubJournal(Pager *pPager){ const int flags = SQLITE_OPEN_SUBJOURNAL | SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE | SQLITE_OPEN_EXCLUSIVE | SQLITE_OPEN_DELETEONCLOSE; - int nBuf = 64*1024; + int nStmtSpill = sqlite3Config.nStmtSpill; if( pPager->journalMode==PAGER_JOURNALMODE_MEMORY || pPager->subjInMemory ){ - nBuf = -1; + nStmtSpill = -1; } - rc = sqlite3JournalOpen(pPager->pVfs, 0, pPager->sjfd, flags, nBuf); + rc = sqlite3JournalOpen(pPager->pVfs, 0, pPager->sjfd, flags, nStmtSpill); } return rc; } |