diff options
| author | drh <drh@noemail.net> | 2013-11-26 18:00:29 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2013-11-26 18:00:29 +0000 |
| commit | 1b2ee4fe1afb4edd3d04e62daeb133df41809e38 (patch) | |
| tree | 3f90016343959f3349a8086cb43c38cb4de975a3 /src/fkey.c | |
| parent | 212c6be1417860712de4b93b31342b72c9fa89dd (diff) | |
| parent | 55fcab39be8186caac6c7d1262a7c943564623bb (diff) | |
| download | sqlite-1b2ee4fe1afb4edd3d04e62daeb133df41809e38.tar.gz sqlite-1b2ee4fe1afb4edd3d04e62daeb133df41809e38.zip | |
Merge in performance enhancements from trunk.
FossilOrigin-Name: fc9ae839569eb28eb734c52d95676c59b2e27494
Diffstat (limited to 'src/fkey.c')
| -rw-r--r-- | src/fkey.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/fkey.c b/src/fkey.c index 1cb6cb0d4..46c90a098 100644 --- a/src/fkey.c +++ b/src/fkey.c @@ -548,6 +548,7 @@ static void fkScanChildren( assert( pIdx==0 || pIdx->pTable==pTab ); assert( pIdx==0 || pIdx->nKeyCol==pFKey->nCol ); assert( pIdx!=0 || pFKey->nCol==1 ); + assert( pIdx!=0 || HasRowid(pTab) ); if( nIncr<0 ){ iFkIfZero = sqlite3VdbeAddOp2(v, OP_FkIfZero, pFKey->isDeferred, 0); @@ -600,6 +601,7 @@ static void fkScanChildren( }else{ Expr *pEq, *pAll = 0; Index *pPk = sqlite3PrimaryKeyIndex(pTab); + assert( pIdx!=0 ); for(i=0; i<pPk->nKeyCol; i++){ i16 iCol = pIdx->aiColumn[i]; pLeft = exprTableRegister(pParse, pTab, regData, iCol); |