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/main.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/main.c')
-rw-r--r-- | src/main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main.c b/src/main.c index 8e89cc553..a2b994f9b 100644 --- a/src/main.c +++ b/src/main.c @@ -4115,7 +4115,7 @@ int sqlite3_snapshot_get( if( iDb==0 || iDb>1 ){ Btree *pBt = db->aDb[iDb].pBt; if( 0==sqlite3BtreeIsInTrans(pBt) ){ - rc = sqlite3BtreeBeginTrans(pBt, 0); + rc = sqlite3BtreeBeginTrans(pBt, 0, 0); if( rc==SQLITE_OK ){ rc = sqlite3PagerSnapshotGet(sqlite3BtreePager(pBt), ppSnapshot); } @@ -4153,7 +4153,7 @@ int sqlite3_snapshot_open( if( 0==sqlite3BtreeIsInReadTrans(pBt) ){ rc = sqlite3PagerSnapshotOpen(sqlite3BtreePager(pBt), pSnapshot); if( rc==SQLITE_OK ){ - rc = sqlite3BtreeBeginTrans(pBt, 0); + rc = sqlite3BtreeBeginTrans(pBt, 0, 0); sqlite3PagerSnapshotOpen(sqlite3BtreePager(pBt), 0); } } @@ -4185,7 +4185,7 @@ int sqlite3_snapshot_recover(sqlite3 *db, const char *zDb){ if( iDb==0 || iDb>1 ){ Btree *pBt = db->aDb[iDb].pBt; if( 0==sqlite3BtreeIsInReadTrans(pBt) ){ - rc = sqlite3BtreeBeginTrans(pBt, 0); + rc = sqlite3BtreeBeginTrans(pBt, 0, 0); if( rc==SQLITE_OK ){ rc = sqlite3PagerSnapshotRecover(sqlite3BtreePager(pBt)); sqlite3BtreeCommit(pBt); |