diff options
| author | drh <drh@noemail.net> | 2010-05-13 08:53:41 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2010-05-13 08:53:41 +0000 |
| commit | 043c20e63e7c075e85ef554fdf7bbba5cd9c0ea7 (patch) | |
| tree | 51961f4f4d2f98d34248b8c4722f7d36d7e8c37e /src/vdbe.c | |
| parent | eaf52d883a9eafbe7ad60bd7590988c66d696c07 (diff) | |
| parent | a925fd256b74e5da9c6320849c3b7d85110ce73f (diff) | |
| download | sqlite-043c20e63e7c075e85ef554fdf7bbba5cd9c0ea7.tar.gz sqlite-043c20e63e7c075e85ef554fdf7bbba5cd9c0ea7.zip | |
The refactored of VFS SHM primitives are now working so merge the
wal-refactor branch back into the trunk.
FossilOrigin-Name: bce21c18380715e894eac9c173c97315e0d69d93
Diffstat (limited to 'src/vdbe.c')
| -rw-r--r-- | src/vdbe.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/vdbe.c b/src/vdbe.c index 88f880ea9..3fee165da 100644 --- a/src/vdbe.c +++ b/src/vdbe.c @@ -5248,8 +5248,8 @@ case OP_JournalMode: { /* out2-prerelease */ ** in temporary storage or if the VFS does not support xShmOpen. */ if( eNew==PAGER_JOURNALMODE_WAL - && (zFilename[0]==0 /* Temp file */ - || pVfs->iVersion<2 || pVfs->xShmOpen==0) /* No xShmOpen support */ + && (zFilename[0]==0 /* Temp file */ + || !sqlite3PagerWalSupported(pPager)) /* No xShmOpen support */ ){ eNew = PAGER_JOURNALMODE_QUERY; } |