aboutsummaryrefslogtreecommitdiff
path: root/src/tokenize.c
diff options
context:
space:
mode:
authordrh <drh@noemail.net>2006-07-26 13:43:30 +0000
committerdrh <drh@noemail.net>2006-07-26 13:43:30 +0000
commit15ca1df1bf54d35d88a8b94540125a68ecd7e5a6 (patch)
tree01bb7575c784831306c68198b70c228a6ecf9fb6 /src/tokenize.c
parent881feaa04380c6c79db9a763048c2f3d04c3a73e (diff)
downloadsqlite-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/tokenize.c')
-rw-r--r--src/tokenize.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/tokenize.c b/src/tokenize.c
index 04da0dcd3..1ade8b85b 100644
--- a/src/tokenize.c
+++ b/src/tokenize.c
@@ -15,7 +15,7 @@
** individual tokens and sends those tokens one-by-one over to the
** parser for analysis.
**
-** $Id: tokenize.c,v 1.122 2006/07/26 01:39:30 drh Exp $
+** $Id: tokenize.c,v 1.123 2006/07/26 13:43:31 drh Exp $
*/
#include "sqliteInt.h"
#include "os.h"
@@ -394,7 +394,9 @@ int sqlite3RunParser(Parse *pParse, const char *zSql, char **pzErrMsg){
extern void sqlite3ParserFree(void*, void(*)(void*));
extern int sqlite3Parser(void*, int, Token, Parse*);
- db->u1.isInterrupted = 0;
+ if( db->activeVdbeCnt==0 ){
+ db->u1.isInterrupted = 0;
+ }
pParse->rc = SQLITE_OK;
i = 0;
pEngine = sqlite3ParserAlloc((void*(*)(int))sqlite3MallocX);