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/delete.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/delete.c')
| -rw-r--r-- | src/delete.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/delete.c b/src/delete.c index 76e8ec26f..a69a62902 100644 --- a/src/delete.c +++ b/src/delete.c @@ -650,7 +650,9 @@ int sqlite3GenerateIndexKey( } if( doMakeRec ){ const char *zAff; - if( pTab->pSelect || (pParse->db->flags & SQLITE_IdxRealAsInt)!=0 ){ + if( pTab->pSelect + || OptimizationDisabled(pParse->db, SQLITE_IdxRealAsInt) + ){ zAff = 0; }else{ zAff = sqlite3IndexAffinityStr(v, pIdx); |