diff options
author | drh <drh@noemail.net> | 2018-07-24 22:02:12 +0000 |
---|---|---|
committer | drh <drh@noemail.net> | 2018-07-24 22:02:12 +0000 |
commit | ba968dbfe7f1e7cc227c4b5952c9868f7f036bad (patch) | |
tree | 71f1f5ba3f1ace7f8fe86edce1c62c4a86d46c9e /src/main.c | |
parent | 5a193dd8e609c2cd6827fbb3d9cc4ff7c66e0c25 (diff) | |
download | sqlite-ba968dbfe7f1e7cc227c4b5952c9868f7f036bad.tar.gz sqlite-ba968dbfe7f1e7cc227c4b5952c9868f7f036bad.zip |
Do not abort running queries due to a CREATE INDEX statement. Allow them
to run to completion before being reprepared. Fix for ticket
[c694113e50321afdf9].
FossilOrigin-Name: 2bd593332da0aade467e7a4ee89e966aa6302f37540a2c5e23671f98a6cb599c
Diffstat (limited to 'src/main.c')
-rw-r--r-- | src/main.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/main.c b/src/main.c index 9c10cab6a..07f668881 100644 --- a/src/main.c +++ b/src/main.c @@ -849,7 +849,7 @@ int sqlite3_db_config(sqlite3 *db, int op, ...){ db->flags &= ~aFlagOp[i].mask; } if( oldFlags!=db->flags ){ - sqlite3ExpirePreparedStatements(db); + sqlite3ExpirePreparedStatements(db, 0); } if( pRes ){ *pRes = (db->flags & aFlagOp[i].mask)!=0; @@ -1292,7 +1292,7 @@ void sqlite3RollbackAll(sqlite3 *db, int tripCode){ sqlite3EndBenignMalloc(); if( schemaChange ){ - sqlite3ExpirePreparedStatements(db); + sqlite3ExpirePreparedStatements(db, 0); sqlite3ResetAllSchemasOfConnection(db); } sqlite3BtreeLeaveAll(db); @@ -1747,7 +1747,7 @@ int sqlite3CreateFunc( assert( !db->mallocFailed ); return SQLITE_BUSY; }else{ - sqlite3ExpirePreparedStatements(db); + sqlite3ExpirePreparedStatements(db, 0); } } @@ -2522,7 +2522,7 @@ static int createCollation( "unable to delete/modify collation sequence due to active statements"); return SQLITE_BUSY; } - sqlite3ExpirePreparedStatements(db); + sqlite3ExpirePreparedStatements(db, 0); /* If collation sequence pColl was created directly by a call to ** sqlite3_create_collation, and not generated by synthCollSeq(), |