aboutsummaryrefslogtreecommitdiff
path: root/src/insert.c
diff options
context:
space:
mode:
authordrh <drh@noemail.net>2014-08-06 01:25:47 +0000
committerdrh <drh@noemail.net>2014-08-06 01:25:47 +0000
commit58c4cbe152e39baadd2e9df87013d23f16c20a66 (patch)
tree1160ce6260d6901566131cb75e8d3b478aa8b1cb /src/insert.c
parent39a7bfd361768dcd89bcf987c1582daafae19819 (diff)
parentbc5cf3813ea1bf56ed19a35028061e779827fffc (diff)
downloadsqlite-58c4cbe152e39baadd2e9df87013d23f16c20a66.tar.gz
sqlite-58c4cbe152e39baadd2e9df87013d23f16c20a66.zip
Merge the latest 3.8.6 beta changes from trunk.
FossilOrigin-Name: 68a6d5e2f43702c78057ae2f2a7345c981d24e17
Diffstat (limited to 'src/insert.c')
-rw-r--r--src/insert.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/insert.c b/src/insert.c
index 38e68ccdb..d0eced5b5 100644
--- a/src/insert.c
+++ b/src/insert.c
@@ -1898,7 +1898,7 @@ static int xferOptimization(
}
}
for(pDestIdx=pDest->pIndex; pDestIdx; pDestIdx=pDestIdx->pNext){
- if( pDestIdx->onError!=OE_None ){
+ if( IsUniqueIndex(pDestIdx) ){
destHasUniqueIdx = 1;
}
for(pSrcIdx=pSrc->pIndex; pSrcIdx; pSrcIdx=pSrcIdx->pNext){