diff options
| author | drh <drh@noemail.net> | 2012-08-15 16:21:55 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2012-08-15 16:21:55 +0000 |
| commit | 16de7f4d3297a8a197d1e588b64e3bdde9593a2a (patch) | |
| tree | 7a38b09267984dec9cee3a2c29a8277ab2c5e3f0 /src/vdbeapi.c | |
| parent | 618fea4830063e6a24fb4c71d7cd5c680ef7d0ab (diff) | |
| parent | e74f4651da9d37fef98d83b293ed220d2ca6a7e4 (diff) | |
| download | sqlite-16de7f4d3297a8a197d1e588b64e3bdde9593a2a.tar.gz sqlite-16de7f4d3297a8a197d1e588b64e3bdde9593a2a.zip | |
Merge all the latest trunk changes into the sessions branch.
FossilOrigin-Name: fc07a4795e027108674d1d41eb4350df629ddc8b
Diffstat (limited to 'src/vdbeapi.c')
| -rw-r--r-- | src/vdbeapi.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/vdbeapi.c b/src/vdbeapi.c index 7524baeac..eb1bb1f08 100644 --- a/src/vdbeapi.c +++ b/src/vdbeapi.c @@ -71,17 +71,11 @@ int sqlite3_finalize(sqlite3_stmt *pStmt){ }else{ Vdbe *v = (Vdbe*)pStmt; sqlite3 *db = v->db; -#if SQLITE_THREADSAFE - sqlite3_mutex *mutex; -#endif if( vdbeSafety(v) ) return SQLITE_MISUSE_BKPT; -#if SQLITE_THREADSAFE - mutex = v->db->mutex; -#endif - sqlite3_mutex_enter(mutex); + sqlite3_mutex_enter(db->mutex); rc = sqlite3VdbeFinalize(v); rc = sqlite3ApiExit(db, rc); - sqlite3_mutex_leave(mutex); + sqlite3LeaveMutexAndCloseZombie(db); } return rc; } |