diff options
author | drh <drh@noemail.net> | 2018-12-31 18:30:41 +0000 |
---|---|---|
committer | drh <drh@noemail.net> | 2018-12-31 18:30:41 +0000 |
commit | 0de6efe59ee54518f2590d7d5eb8f55a374b9811 (patch) | |
tree | a720aa0e01fc709c840a8ddfcebc500bb67d15c2 /src/update.c | |
parent | 01e92df41ef05b7ec1807beccc697fd521abc584 (diff) | |
parent | d0fb7960cea5d26a40a0a7ca00c4274545e96efe (diff) | |
download | sqlite-0de6efe59ee54518f2590d7d5eb8f55a374b9811.tar.gz sqlite-0de6efe59ee54518f2590d7d5eb8f55a374b9811.zip |
Merge enhancements and bug fixes from trunk.
FossilOrigin-Name: 9fb646f29c05bca5f677a2c7c4f45c36bfe0a0c6a88cb7968b4a0459bdd63bb2
Diffstat (limited to 'src/update.c')
-rw-r--r-- | src/update.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/update.c b/src/update.c index 70f4f676d..0cf15a091 100644 --- a/src/update.c +++ b/src/update.c @@ -441,7 +441,7 @@ void sqlite3Update( #endif /* Jump to labelBreak to abandon further processing of this UPDATE */ - labelContinue = labelBreak = sqlite3VdbeMakeLabel(v); + labelContinue = labelBreak = sqlite3VdbeMakeLabel(pParse); /* Not an UPSERT. Normal processing. Begin by ** initialize the count of updated rows */ @@ -576,13 +576,13 @@ void sqlite3Update( VdbeCoverage(v); } if( eOnePass!=ONEPASS_SINGLE ){ - labelContinue = sqlite3VdbeMakeLabel(v); + labelContinue = sqlite3VdbeMakeLabel(pParse); } sqlite3VdbeAddOp2(v, OP_IsNull, pPk ? regKey : regOldRowid, labelBreak); VdbeCoverageIf(v, pPk==0); VdbeCoverageIf(v, pPk!=0); }else if( pPk ){ - labelContinue = sqlite3VdbeMakeLabel(v); + labelContinue = sqlite3VdbeMakeLabel(pParse); sqlite3VdbeAddOp2(v, OP_Rewind, iEph, labelBreak); VdbeCoverage(v); addrTop = sqlite3VdbeAddOp2(v, OP_RowData, iEph, regKey); sqlite3VdbeAddOp4Int(v, OP_NotFound, iDataCur, labelContinue, regKey, 0); |