diff options
| author | drh <> | 2023-06-16 11:05:49 +0000 |
|---|---|---|
| committer | drh <> | 2023-06-16 11:05:49 +0000 |
| commit | 2e4d526996ab5fd3a5d5eff0606dca5789d2edf3 (patch) | |
| tree | 15bdd3decfc2bef304cf508b6cdfc2a2df30791e /src | |
| parent | f025fc164d3dc3d6e91cfd81a5e350ada3c12d7d (diff) | |
| download | sqlite-2e4d526996ab5fd3a5d5eff0606dca5789d2edf3.tar.gz sqlite-2e4d526996ab5fd3a5d5eff0606dca5789d2edf3.zip | |
Fix the pager such that if the xOpen() message sends back the SQLITE_OPEN_MEMORY
flag, the pager is opened in journal-mode MEMORY, even if compiled with
SQLITE_OMIT_DESERIALIZE. No changes to the logic as long as that OMIT flag
is omitted. We need to better document the behavior of xOpen to describe this.
FossilOrigin-Name: da1252b29852191eccbea98e0314408c75bb83a51f9d68d589705d4971a23850
Diffstat (limited to 'src')
| -rw-r--r-- | src/pager.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/pager.c b/src/pager.c index d8819c89e..de4d9791e 100644 --- a/src/pager.c +++ b/src/pager.c @@ -4679,11 +4679,7 @@ int sqlite3PagerOpen( int rc = SQLITE_OK; /* Return code */ int tempFile = 0; /* True for temp files (incl. in-memory files) */ int memDb = 0; /* True if this is an in-memory file */ -#ifndef SQLITE_OMIT_DESERIALIZE int memJM = 0; /* Memory journal mode */ -#else -# define memJM 0 -#endif int readOnly = 0; /* True if this is a read-only file */ int journalFileSize; /* Bytes to allocate for each journal fd */ char *zPathname = 0; /* Full path to database file */ @@ -4882,9 +4878,7 @@ int sqlite3PagerOpen( int fout = 0; /* VFS flags returned by xOpen() */ rc = sqlite3OsOpen(pVfs, pPager->zFilename, pPager->fd, vfsFlags, &fout); assert( !memDb ); -#ifndef SQLITE_OMIT_DESERIALIZE pPager->memVfs = memJM = (fout&SQLITE_OPEN_MEMORY)!=0; -#endif readOnly = (fout&SQLITE_OPEN_READONLY)!=0; /* If the file was successfully opened for read/write access, |