diff options
| author | drh <drh@noemail.net> | 2006-07-26 13:43:30 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2006-07-26 13:43:30 +0000 |
| commit | 15ca1df1bf54d35d88a8b94540125a68ecd7e5a6 (patch) | |
| tree | 01bb7575c784831306c68198b70c228a6ecf9fb6 /src/vdbe.c | |
| parent | 881feaa04380c6c79db9a763048c2f3d04c3a73e (diff) | |
| download | sqlite-15ca1df1bf54d35d88a8b94540125a68ecd7e5a6.tar.gz sqlite-15ca1df1bf54d35d88a8b94540125a68ecd7e5a6.zip | |
More work toward getting sqlite3_interrupt() to work from separate
threads. Ticket #1897. (CVS 3336)
FossilOrigin-Name: e431131d47481f9fc64c498e8934b10a96b0a931
Diffstat (limited to 'src/vdbe.c')
| -rw-r--r-- | src/vdbe.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/vdbe.c b/src/vdbe.c index 203890889..40595e4bc 100644 --- a/src/vdbe.c +++ b/src/vdbe.c @@ -43,7 +43,7 @@ ** in this file for details. If in doubt, do not deviate from existing ** commenting and indentation practices when changing or adding code. ** -** $Id: vdbe.c,v 1.571 2006/07/26 01:39:30 drh Exp $ +** $Id: vdbe.c,v 1.572 2006/07/26 13:43:31 drh Exp $ */ #include "sqliteInt.h" #include "os.h" @@ -4048,6 +4048,7 @@ case OP_ParseSchema: { /* no-push */ db->init.busy = 1; assert( !sqlite3MallocFailed() ); rc = sqlite3_exec(db, zSql, sqlite3InitCallback, &initData, 0); + if( rc==SQLITE_ABORT ) rc = initData.rc; sqliteFree(zSql); db->init.busy = 0; sqlite3SafetyOn(db); @@ -4971,7 +4972,6 @@ abort_due_to_error: */ abort_due_to_interrupt: assert( db->u1.isInterrupted ); - db->u1.isInterrupted = 0; if( db->magic!=SQLITE_MAGIC_BUSY ){ rc = SQLITE_MISUSE; }else{ |