database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-08 14:02:16 +03:00
Code Activity

Merge the latest trunk changes into shared-schema branch. Also fix a C99-ism

Browse Source 
in that branch.

FossilOrigin-Name: 42338e9e6979bb497823527f8f39e96f63623c59
This commit is contained in:
drh
2012-06-05 19:20:03 +00:00
parent ca8b9bac3b 98c78ea63f
commit bae591a960
46 changed files with 29631 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/vdbe.c
View File

@@ -5511,7 +5511,7 @@ case OP_JournalMode: { /* out2-prerelease */
if( !sqlite3PagerOkToChangeJournalMode(pPager) ) eNew = eOld;
#ifndef SQLITE_OMIT_WAL
zFilename = sqlite3PagerFilename(pPager);
zFilename = sqlite3PagerFilename(pPager, 1);
/* Do not allow a transition to journal_mode=WAL for a database
** in temporary storage or if the VFS does not support shared memory