database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-14 00:22:38 +03:00
Code Activity

Merge the latest trunk changes, especially the ORDER BY optimizer enhancements

Browse Source 
but also other fixes, onto the sessions branch.

FossilOrigin-Name: f1fbb8c5bfa84e84e0b8e2872d83b06a0c0d5acc
This commit is contained in:
drh
2012-10-09 14:58:15 +00:00
parent c4645dacfb 5a55826bcd
commit d1102b1ec7
41 changed files with 1105 additions and 565 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/vdbeaux.c
View File

@@ -1771,7 +1771,9 @@ static int vdbeCommit(sqlite3 *db, Vdbe *p){
if( sqlite3BtreeIsInTrans(pBt) ){
needXcommit = 1;
if( i!=1 ) nTrans++;
sqlite3BtreeEnter(pBt);
rc = sqlite3PagerExclusiveLock(sqlite3BtreePager(pBt));
sqlite3BtreeLeave(pBt);
}
}
if( rc!=SQLITE_OK ){