diff options
| author | dan <dan@noemail.net> | 2010-08-03 18:29:04 +0000 |
|---|---|---|
| committer | dan <dan@noemail.net> | 2010-08-03 18:29:04 +0000 |
| commit | d5e0101be04d7013650b3b5aa6e6b0d30be654b9 (patch) | |
| tree | 430c5f872f553c40057b62c67d605bb77f17e25f /src/main.c | |
| parent | a42c66bdfb009404579af14a7ded35c03f5dab73 (diff) | |
| parent | a3e414cd4827402b7d877a9c368a0afdb9fbe637 (diff) | |
| download | sqlite-d5e0101be04d7013650b3b5aa6e6b0d30be654b9.tar.gz sqlite-d5e0101be04d7013650b3b5aa6e6b0d30be654b9.zip | |
Merge trunk changes into experimental branch.
FossilOrigin-Name: 15368a9f8523d5fb611cd576080daed2cf2f1500
Diffstat (limited to 'src/main.c')
| -rw-r--r-- | src/main.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/src/main.c b/src/main.c index c3828d5d9..b233c8473 100644 --- a/src/main.c +++ b/src/main.c @@ -1308,16 +1308,7 @@ int sqlite3Checkpoint(sqlite3 *db, int iDb){ for(i=0; i<db->nDb && rc==SQLITE_OK; i++){ if( i==iDb || iDb==SQLITE_MAX_ATTACHED ){ - Btree *pBt = db->aDb[i].pBt; - if( pBt ){ - if( sqlite3BtreeIsInReadTrans(pBt) ){ - rc = SQLITE_LOCKED; - }else{ - sqlite3BtreeEnter(pBt); - rc = sqlite3PagerCheckpoint(sqlite3BtreePager(pBt)); - sqlite3BtreeLeave(pBt); - } - } + rc = sqlite3BtreeCheckpoint(db->aDb[i].pBt); } } |