diff options
| author | drh <drh@noemail.net> | 2012-09-28 13:05:48 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2012-09-28 13:05:48 +0000 |
| commit | c4645dacfb435002911b187b474fa0788db9cde0 (patch) | |
| tree | e757051bb0f952d0cb149b62ff6bdbbfdb99eb82 /src/pager.c | |
| parent | 40eaa08620a75a29f4849cd3572e64feaafce5ec (diff) | |
| parent | f784c1ede942139d136f7c00a1d8fb30a4a31f18 (diff) | |
| download | sqlite-c4645dacfb435002911b187b474fa0788db9cde0.tar.gz sqlite-c4645dacfb435002911b187b474fa0788db9cde0.zip | |
Merge the latest trunk changes (especially "PRAGMA busy_timeout" and the
ORDER BY query planner optimizations) into the sessions branch.
FossilOrigin-Name: 6ca8eae1f89d19ee23cbc3a869d85b57d29b4a7d
Diffstat (limited to 'src/pager.c')
| -rw-r--r-- | src/pager.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/pager.c b/src/pager.c index 09c2a5f90..a094e0da2 100644 --- a/src/pager.c +++ b/src/pager.c @@ -4448,7 +4448,7 @@ int sqlite3PagerOpen( memcpy(pPager->zFilename, zPathname, nPathname); if( nUri ) memcpy(&pPager->zFilename[nPathname+1], zUri, nUri); memcpy(pPager->zJournal, zPathname, nPathname); - memcpy(&pPager->zJournal[nPathname], "-journal\000", 8+1); + memcpy(&pPager->zJournal[nPathname], "-journal\000", 8+2); sqlite3FileSuffix3(pPager->zFilename, pPager->zJournal); #ifndef SQLITE_OMIT_WAL pPager->zWal = &pPager->zJournal[nPathname+8+1]; |