diff options
| author | drh <drh@noemail.net> | 2012-08-15 16:21:55 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2012-08-15 16:21:55 +0000 |
| commit | 16de7f4d3297a8a197d1e588b64e3bdde9593a2a (patch) | |
| tree | 7a38b09267984dec9cee3a2c29a8277ab2c5e3f0 /src/expr.c | |
| parent | 618fea4830063e6a24fb4c71d7cd5c680ef7d0ab (diff) | |
| parent | e74f4651da9d37fef98d83b293ed220d2ca6a7e4 (diff) | |
| download | sqlite-16de7f4d3297a8a197d1e588b64e3bdde9593a2a.tar.gz sqlite-16de7f4d3297a8a197d1e588b64e3bdde9593a2a.zip | |
Merge all the latest trunk changes into the sessions branch.
FossilOrigin-Name: fc07a4795e027108674d1d41eb4350df629ddc8b
Diffstat (limited to 'src/expr.c')
| -rw-r--r-- | src/expr.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/expr.c b/src/expr.c index 1e46596a2..790aa45f3 100644 --- a/src/expr.c +++ b/src/expr.c @@ -1701,7 +1701,7 @@ int sqlite3CodeSubselect( assert( !isRowid ); sqlite3SelectDestInit(&dest, SRT_Set, pExpr->iTable); - dest.affinity = (u8)affinity; + dest.affSdst = (u8)affinity; assert( (pExpr->iTable&0x0000FFFF)==pExpr->iTable ); pExpr->x.pSelect->iLimit = 0; if( sqlite3Select(pParse, pExpr->x.pSelect, &dest) ){ @@ -1794,11 +1794,11 @@ int sqlite3CodeSubselect( sqlite3SelectDestInit(&dest, 0, ++pParse->nMem); if( pExpr->op==TK_SELECT ){ dest.eDest = SRT_Mem; - sqlite3VdbeAddOp2(v, OP_Null, 0, dest.iParm); + sqlite3VdbeAddOp2(v, OP_Null, 0, dest.iSDParm); VdbeComment((v, "Init subquery result")); }else{ dest.eDest = SRT_Exists; - sqlite3VdbeAddOp2(v, OP_Integer, 0, dest.iParm); + sqlite3VdbeAddOp2(v, OP_Integer, 0, dest.iSDParm); VdbeComment((v, "Init EXISTS result")); } sqlite3ExprDelete(pParse->db, pSel->pLimit); @@ -1808,7 +1808,7 @@ int sqlite3CodeSubselect( if( sqlite3Select(pParse, pSel, &dest) ){ return 0; } - rReg = dest.iParm; + rReg = dest.iSDParm; ExprSetIrreducible(pExpr); break; } |