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/wherecode.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/wherecode.c')
| -rw-r--r-- | src/wherecode.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/wherecode.c b/src/wherecode.c index f9510dd2d..cffa78959 100644 --- a/src/wherecode.c +++ b/src/wherecode.c @@ -566,7 +566,7 @@ static int codeEqualityTerm( pLoop->wsFlags |= WHERE_IN_ABLE; if( pLevel->u.in.nIn==0 ){ - pLevel->addrNxt = sqlite3VdbeMakeLabel(v); + pLevel->addrNxt = sqlite3VdbeMakeLabel(pParse); } i = pLevel->u.in.nIn; @@ -1208,8 +1208,8 @@ Bitmask sqlite3WhereCodeOneLoopStart( ** there are no IN operators in the constraints, the "addrNxt" label ** is the same as "addrBrk". */ - addrBrk = pLevel->addrBrk = pLevel->addrNxt = sqlite3VdbeMakeLabel(v); - addrCont = pLevel->addrCont = sqlite3VdbeMakeLabel(v); + addrBrk = pLevel->addrBrk = pLevel->addrNxt = sqlite3VdbeMakeLabel(pParse); + addrCont = pLevel->addrCont = sqlite3VdbeMakeLabel(pParse); /* If this is the right table of a LEFT OUTER JOIN, allocate and ** initialize a memory cell that records if this table matches any @@ -1832,7 +1832,7 @@ Bitmask sqlite3WhereCodeOneLoopStart( int regReturn = ++pParse->nMem; /* Register used with OP_Gosub */ int regRowset = 0; /* Register for RowSet object */ int regRowid = 0; /* Register holding rowid */ - int iLoopBody = sqlite3VdbeMakeLabel(v); /* Start of loop body */ + int iLoopBody = sqlite3VdbeMakeLabel(pParse);/* Start of loop body */ int iRetInit; /* Address of regReturn init */ int untestedTerms = 0; /* Some terms not completely tested */ int ii; /* Loop counter */ |