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/pragma.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/pragma.c')
| -rw-r--r-- | src/pragma.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/pragma.c b/src/pragma.c index 2f27d1100..faef5f74a 100644 --- a/src/pragma.c +++ b/src/pragma.c @@ -1376,7 +1376,7 @@ void sqlite3Pragma( x = sqlite3FkLocateIndex(pParse, pParent, pFK, &pIdx, &aiCols); assert( x==0 ); } - addrOk = sqlite3VdbeMakeLabel(v); + addrOk = sqlite3VdbeMakeLabel(pParse); /* Generate code to read the child key values into registers ** regRow..regRow+n. If any of the child key values are NULL, this @@ -1596,8 +1596,8 @@ void sqlite3Pragma( if( pTab->pCheck && (db->flags & SQLITE_IgnoreChecks)==0 ){ ExprList *pCheck = sqlite3ExprListDup(db, pTab->pCheck, 0); if( db->mallocFailed==0 ){ - int addrCkFault = sqlite3VdbeMakeLabel(v); - int addrCkOk = sqlite3VdbeMakeLabel(v); + int addrCkFault = sqlite3VdbeMakeLabel(pParse); + int addrCkOk = sqlite3VdbeMakeLabel(pParse); char *zErr; int k; pParse->iSelfTab = iDataCur + 1; @@ -1620,7 +1620,7 @@ void sqlite3Pragma( /* Validate index entries for the current row */ for(j=0, pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext, j++){ int jmp2, jmp3, jmp4, jmp5; - int ckUniq = sqlite3VdbeMakeLabel(v); + int ckUniq = sqlite3VdbeMakeLabel(pParse); if( pPk==pIdx ) continue; r1 = sqlite3GenerateIndexKey(pParse, pIdx, iDataCur, 0, 0, &jmp3, pPrior, r1); @@ -1641,7 +1641,7 @@ void sqlite3Pragma( ** current key. The entry is unique if (1) any column is NULL ** or (2) the next entry has a different key */ if( IsUniqueIndex(pIdx) ){ - int uniqOk = sqlite3VdbeMakeLabel(v); + int uniqOk = sqlite3VdbeMakeLabel(pParse); int jmp6; int kk; for(kk=0; kk<pIdx->nKeyCol; kk++){ |