diff options
| author | drh <drh@noemail.net> | 2013-05-03 18:29:22 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2013-05-03 18:29:22 +0000 |
| commit | ec7ecb8c9a42c68e6152f7e72b2badcbb8671c55 (patch) | |
| tree | e0ff1a0cdbb5bafdea569c861d8913ef63d962fb /src/expr.c | |
| parent | 16fb176814bd2b8fe46f7ed0e50a0b3d33db89a0 (diff) | |
| parent | bce5beee18befa9b3ee47938e9e4c3e2e572cf3c (diff) | |
| download | sqlite-ec7ecb8c9a42c68e6152f7e72b2badcbb8671c55.tar.gz sqlite-ec7ecb8c9a42c68e6152f7e72b2badcbb8671c55.zip | |
Merge all recent trunk changes into the sessions branch.
FossilOrigin-Name: 3879ab1b532828fcc12a50a95b6730faebcb69e9
Diffstat (limited to 'src/expr.c')
| -rw-r--r-- | src/expr.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/expr.c b/src/expr.c index ae6a1dec1..a974c5a61 100644 --- a/src/expr.c +++ b/src/expr.c @@ -1214,6 +1214,7 @@ static int selectNodeIsConstant(Walker *pWalker, Select *NotUsed){ } static int exprIsConst(Expr *p, int initFlag){ Walker w; + memset(&w, 0, sizeof(w)); w.u.i = initFlag; w.xExprCallback = exprNodeIsConstant; w.xSelectCallback = selectNodeIsConstant; @@ -3428,8 +3429,8 @@ void sqlite3ExprCodeConstants(Parse *pParse, Expr *pExpr){ Walker w; if( pParse->cookieGoto ) return; if( OptimizationDisabled(pParse->db, SQLITE_FactorOutConst) ) return; + memset(&w, 0, sizeof(w)); w.xExprCallback = evalConstExpr; - w.xSelectCallback = 0; w.pParse = pParse; sqlite3WalkExpr(&w, pExpr); } |