diff options
| author | dan <dan@noemail.net> | 2015-04-22 09:40:35 +0000 |
|---|---|---|
| committer | dan <dan@noemail.net> | 2015-04-22 09:40:35 +0000 |
| commit | 062c267dffc17aeea9e41c8a553bc7f20a949e04 (patch) | |
| tree | 8b0be371e782c9cb20665994bb92c2ec48d27924 /src/test_multiplex.c | |
| parent | 5bb97c2b801248ab08b37b99926962f7db5c0e09 (diff) | |
| parent | 318d38cf7e16d0f47dc982c33e80792e06a6fff6 (diff) | |
| download | sqlite-062c267dffc17aeea9e41c8a553bc7f20a949e04.tar.gz sqlite-062c267dffc17aeea9e41c8a553bc7f20a949e04.zip | |
Update this branch with latest trunk changes.
FossilOrigin-Name: 9797482ded7de985e3b20aedec5e4d81f55065c8
Diffstat (limited to 'src/test_multiplex.c')
| -rw-r--r-- | src/test_multiplex.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/test_multiplex.c b/src/test_multiplex.c index cd379f18f..c1077fbee 100644 --- a/src/test_multiplex.c +++ b/src/test_multiplex.c @@ -568,15 +568,15 @@ static int multiplexOpen( if( pSubOpen==0 && rc==SQLITE_OK ) rc = SQLITE_CANTOPEN; } if( rc==SQLITE_OK ){ - sqlite3_int64 sz; + sqlite3_int64 sz64; - rc = pSubOpen->pMethods->xFileSize(pSubOpen, &sz); + rc = pSubOpen->pMethods->xFileSize(pSubOpen, &sz64); if( rc==SQLITE_OK && zName ){ int bExists; if( flags & SQLITE_OPEN_MASTER_JOURNAL ){ pGroup->bEnabled = 0; }else - if( sz==0 ){ + if( sz64==0 ){ if( flags & SQLITE_OPEN_MAIN_JOURNAL ){ /* If opening a main journal file and the first chunk is zero ** bytes in size, delete any subsequent chunks from the @@ -607,10 +607,10 @@ static int multiplexOpen( rc = pOrigVfs->xAccess(pOrigVfs, pGroup->aReal[1].z, SQLITE_ACCESS_EXISTS, &bExists); bExists = multiplexSubSize(pGroup, 1, &rc)>0; - if( rc==SQLITE_OK && bExists && sz==(sz&0xffff0000) && sz>0 - && sz!=pGroup->szChunk ){ - pGroup->szChunk = (int)sz; - }else if( rc==SQLITE_OK && !bExists && sz>pGroup->szChunk ){ + if( rc==SQLITE_OK && bExists && sz64==(sz64&0xffff0000) && sz64>0 + && sz64!=pGroup->szChunk ){ + pGroup->szChunk = (int)sz64; + }else if( rc==SQLITE_OK && !bExists && sz64>pGroup->szChunk ){ pGroup->bEnabled = 0; } } |