diff options
| author | drh <drh@noemail.net> | 2014-08-06 01:25:47 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2014-08-06 01:25:47 +0000 |
| commit | 58c4cbe152e39baadd2e9df87013d23f16c20a66 (patch) | |
| tree | 1160ce6260d6901566131cb75e8d3b478aa8b1cb /src/analyze.c | |
| parent | 39a7bfd361768dcd89bcf987c1582daafae19819 (diff) | |
| parent | bc5cf3813ea1bf56ed19a35028061e779827fffc (diff) | |
| download | sqlite-58c4cbe152e39baadd2e9df87013d23f16c20a66.tar.gz sqlite-58c4cbe152e39baadd2e9df87013d23f16c20a66.zip | |
Merge the latest 3.8.6 beta changes from trunk.
FossilOrigin-Name: 68a6d5e2f43702c78057ae2f2a7345c981d24e17
Diffstat (limited to 'src/analyze.c')
| -rw-r--r-- | src/analyze.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/analyze.c b/src/analyze.c index 43aff141b..f9c03dc84 100644 --- a/src/analyze.c +++ b/src/analyze.c @@ -1129,7 +1129,7 @@ static void analyzeOneTable( */ sqlite3VdbeAddOp0(v, OP_Goto); addrNextRow = sqlite3VdbeCurrentAddr(v); - if( nColTest==1 && pIdx->nKeyCol==1 && pIdx->onError!=OE_None ){ + if( nColTest==1 && pIdx->nKeyCol==1 && IsUniqueIndex(pIdx) ){ /* For a single-column UNIQUE index, once we have found a non-NULL ** row, we know that all the rest will be distinct, so skip ** subsequent distinctness tests. */ |