diff options
| author | drh <drh@noemail.net> | 2014-09-02 15:49:47 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2014-09-02 15:49:47 +0000 |
| commit | bf9ed6f9af8db145efb7294b1bb05b35fc70e7fc (patch) | |
| tree | 870d850426bb945aee018a2dc2612f52f3248619 /src/expr.c | |
| parent | e1ed0b0e1787b0e5c6b2b59de4e2f161a82bec22 (diff) | |
| parent | f8ede57a6165889316f8a9df8ac1166c7a568100 (diff) | |
| download | sqlite-bf9ed6f9af8db145efb7294b1bb05b35fc70e7fc.tar.gz sqlite-bf9ed6f9af8db145efb7294b1bb05b35fc70e7fc.zip | |
Merge the latest trunk changes, including the multi-threaded sorter, into
the sessions branch.
FossilOrigin-Name: d4cce2c71e64ab7b6a65a81b88b69445ed859351
Diffstat (limited to 'src/expr.c')
| -rw-r--r-- | src/expr.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/expr.c b/src/expr.c index fabdae2fc..1a2465f7e 100644 --- a/src/expr.c +++ b/src/expr.c @@ -1912,6 +1912,7 @@ int sqlite3CodeSubselect( sqlite3SelectDestInit(&dest, 0, ++pParse->nMem); if( pExpr->op==TK_SELECT ){ dest.eDest = SRT_Mem; + dest.iSdst = dest.iSDParm; sqlite3VdbeAddOp2(v, OP_Null, 0, dest.iSDParm); VdbeComment((v, "Init subquery result")); }else{ |