diff options
| author | dan <dan@noemail.net> | 2018-06-07 20:35:28 +0000 |
|---|---|---|
| committer | dan <dan@noemail.net> | 2018-06-07 20:35:28 +0000 |
| commit | 07509f8c1edce1378cb71e16b605ece614bd198d (patch) | |
| tree | f4120ffe956aaac84d31faa7f5d3211eb08467aa /src/backup.c | |
| parent | fe4e25a0f6b9bdb7f8cd165497fd7341fa3e8691 (diff) | |
| parent | 83193d0133328a28dbd4d4bbd1f9747158d253a2 (diff) | |
| download | sqlite-07509f8c1edce1378cb71e16b605ece614bd198d.tar.gz sqlite-07509f8c1edce1378cb71e16b605ece614bd198d.zip | |
Merge latest trunk changes with this branch.
FossilOrigin-Name: 251022034219819a1dc356542770ff46e3147a080f072eb20af6106771dadd92
Diffstat (limited to 'src/backup.c')
| -rw-r--r-- | src/backup.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/backup.c b/src/backup.c index 165144d96..4200940b2 100644 --- a/src/backup.c +++ b/src/backup.c @@ -382,7 +382,7 @@ int sqlite3_backup_step(sqlite3_backup *p, int nPage){ ** before this function exits. */ if( rc==SQLITE_OK && 0==sqlite3BtreeIsInReadTrans(p->pSrc) ){ - rc = sqlite3BtreeBeginTrans(p->pSrc, 0); + rc = sqlite3BtreeBeginTrans(p->pSrc, 0, 0); bCloseTrans = 1; } @@ -398,10 +398,10 @@ int sqlite3_backup_step(sqlite3_backup *p, int nPage){ /* Lock the destination database, if it is not locked already. */ if( SQLITE_OK==rc && p->bDestLocked==0 - && SQLITE_OK==(rc = sqlite3BtreeBeginTrans(p->pDest, 2)) + && SQLITE_OK==(rc = sqlite3BtreeBeginTrans(p->pDest, 2, + (int*)&p->iDestSchema)) ){ p->bDestLocked = 1; - sqlite3BtreeGetMeta(p->pDest, BTREE_SCHEMA_VERSION, &p->iDestSchema); } /* Do not allow backup if the destination database is in WAL mode |