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 vtab-conflict branch with trunk.

Browse Source 
FossilOrigin-Name: 8f9666af5f9459cbd0305a86281d745ea6163acf
This commit is contained in:
dan
2011-05-04 17:23:19 +00:00
parent 4d953fd5b1 62d6c7e32b
commit 7b0ced74c0
23 changed files with 1390 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/vdbeaux.c
View File

@@ -2013,6 +2013,15 @@ int sqlite3VdbeCloseStatement(Vdbe *p, int eOp){
db->nStatement--;
p->iStatement = 0;
if( rc==SQLITE_OK ){
if( eOp==SAVEPOINT_ROLLBACK ){
rc = sqlite3VtabSavepoint(db, SAVEPOINT_ROLLBACK, iSavepoint);
}
if( rc==SQLITE_OK ){
rc = sqlite3VtabSavepoint(db, SAVEPOINT_RELEASE, iSavepoint);
}
}
/* If the statement transaction is being rolled back, also restore the
** database handles deferred constraint counter to the value it had when
** the statement transaction was opened. */