diff options
| author | drh <drh@noemail.net> | 2013-12-19 14:34:34 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2013-12-19 14:34:34 +0000 |
| commit | a021f121c96a5fe4a1176f30a257b5fe8eb3d2d5 (patch) | |
| tree | 23fb855d64ffb71607c49b45524a59be85cd4886 /src | |
| parent | edfac3456e86de8b242e8129d25da1d55e0f1ac4 (diff) | |
| download | sqlite-a021f121c96a5fe4a1176f30a257b5fe8eb3d2d5.tar.gz sqlite-a021f121c96a5fe4a1176f30a257b5fe8eb3d2d5.zip | |
Remove an unneeded column-cache flush in aggregate SELECT
and an unreachable branch in the INSERT logic.
FossilOrigin-Name: ffa092e13b3781677b18418cca40e3dd1e388aed
Diffstat (limited to 'src')
| -rw-r--r-- | src/insert.c | 2 | ||||
| -rw-r--r-- | src/select.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/insert.c b/src/insert.c index fe1f74add..b3b8444f3 100644 --- a/src/insert.c +++ b/src/insert.c @@ -1515,7 +1515,7 @@ void sqlite3GenerateConstraintChecks( int x; /* Extract the PRIMARY KEY from the end of the index entry and ** store it in registers regR..regR+nPk-1 */ - if( (isUpdate || onError==OE_Replace) && pIdx!=pPk ){ + if( pIdx!=pPk ){ for(i=0; i<pPk->nKeyCol; i++){ x = sqlite3ColumnOfIndex(pIdx, pPk->aiColumn[i]); sqlite3VdbeAddOp3(v, OP_Column, iThisCur, x, regR+i); diff --git a/src/select.c b/src/select.c index c394d1c31..132d54697 100644 --- a/src/select.c +++ b/src/select.c @@ -3875,7 +3875,6 @@ static void updateAccumulator(Parse *pParse, AggInfo *pAggInfo){ struct AggInfo_col *pC; pAggInfo->directMode = 1; - sqlite3ExprCacheClear(pParse); for(i=0, pF=pAggInfo->aFunc; i<pAggInfo->nFunc; i++, pF++){ int nArg; int addrNext = 0; |