diff options
| author | drh <drh@noemail.net> | 2012-09-28 13:05:48 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2012-09-28 13:05:48 +0000 |
| commit | c4645dacfb435002911b187b474fa0788db9cde0 (patch) | |
| tree | e757051bb0f952d0cb149b62ff6bdbbfdb99eb82 /src/vdbeapi.c | |
| parent | 40eaa08620a75a29f4849cd3572e64feaafce5ec (diff) | |
| parent | f784c1ede942139d136f7c00a1d8fb30a4a31f18 (diff) | |
| download | sqlite-c4645dacfb435002911b187b474fa0788db9cde0.tar.gz sqlite-c4645dacfb435002911b187b474fa0788db9cde0.zip | |
Merge the latest trunk changes (especially "PRAGMA busy_timeout" and the
ORDER BY query planner optimizations) into the sessions branch.
FossilOrigin-Name: 6ca8eae1f89d19ee23cbc3a869d85b57d29b4a7d
Diffstat (limited to 'src/vdbeapi.c')
| -rw-r--r-- | src/vdbeapi.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/vdbeapi.c b/src/vdbeapi.c index eb1bb1f08..4ac67d655 100644 --- a/src/vdbeapi.c +++ b/src/vdbeapi.c @@ -478,10 +478,12 @@ int sqlite3_step(sqlite3_stmt *pStmt){ } db = v->db; sqlite3_mutex_enter(db->mutex); + v->doingRerun = 0; while( (rc = sqlite3Step(v))==SQLITE_SCHEMA && cnt++ < SQLITE_MAX_SCHEMA_RETRY && (rc2 = rc = sqlite3Reprepare(v))==SQLITE_OK ){ sqlite3_reset(pStmt); + v->doingRerun = 1; assert( v->expired==0 ); } if( rc2!=SQLITE_OK && ALWAYS(v->isPrepareV2) && ALWAYS(db->pErr) ){ |