diff options
| author | dan <dan@noemail.net> | 2015-03-24 18:21:41 +0000 |
|---|---|---|
| committer | dan <dan@noemail.net> | 2015-03-24 18:21:41 +0000 |
| commit | 6da7a0a93da31b48081f50e92d4e7b5ffe19522d (patch) | |
| tree | 3e9128ad52de6f69aa11508109f8eb28d1bb2309 /src/test_multiplex.c | |
| parent | f37120a416aee4703f5305e68c7535927678cc87 (diff) | |
| parent | 126e9e6347216e47b538e4e8f24cfc2d752d89b3 (diff) | |
| download | sqlite-6da7a0a93da31b48081f50e92d4e7b5ffe19522d.tar.gz sqlite-6da7a0a93da31b48081f50e92d4e7b5ffe19522d.zip | |
Merge the latest trunk changes into this branch.
FossilOrigin-Name: 9d9b6c883b4f7d69c615cedfb59a2385aac47b74
Diffstat (limited to 'src/test_multiplex.c')
| -rw-r--r-- | src/test_multiplex.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/test_multiplex.c b/src/test_multiplex.c index dbd395d62..cd379f18f 100644 --- a/src/test_multiplex.c +++ b/src/test_multiplex.c @@ -573,6 +573,9 @@ static int multiplexOpen( rc = pSubOpen->pMethods->xFileSize(pSubOpen, &sz); if( rc==SQLITE_OK && zName ){ int bExists; + if( flags & SQLITE_OPEN_MASTER_JOURNAL ){ + pGroup->bEnabled = 0; + }else if( sz==0 ){ if( flags & SQLITE_OPEN_MAIN_JOURNAL ){ /* If opening a main journal file and the first chunk is zero |