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/resolve.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/resolve.c')
| -rw-r--r-- | src/resolve.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/resolve.c b/src/resolve.c index 9b350caf8..a8e196926 100644 --- a/src/resolve.c +++ b/src/resolve.c @@ -1283,6 +1283,7 @@ int sqlite3ResolveExprNames( #endif savedHasAgg = pNC->ncFlags & NC_HasAgg; pNC->ncFlags &= ~NC_HasAgg; + memset(&w, 0, sizeof(w)); w.xExprCallback = resolveExprStep; w.xSelectCallback = resolveSelectStep; w.pParse = pNC->pParse; @@ -1323,6 +1324,7 @@ void sqlite3ResolveSelectNames( Walker w; assert( p!=0 ); + memset(&w, 0, sizeof(w)); w.xExprCallback = resolveExprStep; w.xSelectCallback = resolveSelectStep; w.pParse = pParse; |