database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-15 11:41:13 +03:00
Code Activity

More work on windows locking. Fix some problems with unix locking. There

Browse Source 
is still an assertion failure on windows locking in attach2.test. (CVS 1539)

FossilOrigin-Name: 0c2d169cf3c0f36972015c952a2b46cb9a333881
This commit is contained in:
drh
2004-06-07 16:27:46 +00:00
parent 517eb64616
commit 2ac3ee9787
12 changed files with 217 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/vdbeaux.c
View File

@@ -922,15 +922,25 @@ static int vdbeCommit(sqlite *db){
}
}
/* The simple case - if less than two databases have write-transactions
** active, there is no need for the master-journal.
/* The simple case - no more than one database file (not counting the TEMP
** database) has a transaction active. There is no need for the
** master-journal.
*/
if( nTrans<2 ){
for(i=0; i<db->nDb; i++){
if( nTrans<=1 ){
for(i=0; rc==SQLITE_OK && i<db->nDb; i++){
Btree *pBt = db->aDb[i].pBt;
if( pBt ){
int rc2 = sqlite3BtreeCommit(db->aDb[i].pBt);
if( rc==SQLITE_OK ) rc = rc2;
rc = sqlite3BtreeSync(pBt, 0);
}
}
/* Do the commit only if all databases successfully synced */
if( rc==SQLITE_OK ){
for(i=0; i<db->nDb; i++){
Btree *pBt = db->aDb[i].pBt;
if( pBt ){
sqlite3BtreeCommit(pBt);
}
}
}
}
@@ -1036,7 +1046,7 @@ static int vdbeCommit(sqlite *db){
}
}
}
return SQLITE_OK;
return rc;
}
/*