database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-08 14:02:16 +03:00
Code Activity

Pull in all the latest changes from trunk.

Browse Source 
FossilOrigin-Name: af3ca4c6e557e6bc92584586b5a97d9be41b0b82
This commit is contained in:
drh
2013-07-09 13:05:49 +00:00
parent bded90b487 1f10c28618
commit 888e16e7c5
57 changed files with 1986 additions and 346 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/vdbeapi.c
View File

@@ -382,11 +382,11 @@ static int sqlite3Step(Vdbe *p){
** reset the interrupt flag. This prevents a call to sqlite3_interrupt
** from interrupting a statement that has not yet started.
*/
if( db->activeVdbeCnt==0 ){
if( db->nVdbeActive==0 ){
db->u1.isInterrupted = 0;
}
assert( db->writeVdbeCnt>0 || db->autoCommit==0
assert( db->nVdbeWrite>0 || db->autoCommit==0
|| (db->nDeferredCons==0 && db->nDeferredImmCons==0)
);
@@ -396,8 +396,9 @@ static int sqlite3Step(Vdbe *p){
}
#endif
db->activeVdbeCnt++;
if( p->readOnly==0 ) db->writeVdbeCnt++;
db->nVdbeActive++;
if( p->readOnly==0 ) db->nVdbeWrite++;
if( p->bIsReader ) db->nVdbeRead++;
p->pc = 0;
}
#ifndef SQLITE_OMIT_EXPLAIN
@@ -406,9 +407,9 @@ static int sqlite3Step(Vdbe *p){
}else
#endif /* SQLITE_OMIT_EXPLAIN */
{
db->vdbeExecCnt++;
db->nVdbeExec++;
rc = sqlite3VdbeExec(p);
db->vdbeExecCnt--;
db->nVdbeExec--;
}
#ifndef SQLITE_OMIT_TRACE