diff options
author | dan <dan@noemail.net> | 2015-05-11 18:46:42 +0000 |
---|---|---|
committer | dan <dan@noemail.net> | 2015-05-11 18:46:42 +0000 |
commit | 1c1cea8baec472eb39ae92d92e2b9b1321334f9c (patch) | |
tree | ec6e360f30971e2dcb08e73ebde9a8e1c94f1e4d /src/resolve.c | |
parent | 828cdb3473fadfcd8b78251e747ab3b9df1eda4a (diff) | |
parent | d13b2319234ddb4857b7b793ec3b26b76251a6ca (diff) | |
download | sqlite-1c1cea8baec472eb39ae92d92e2b9b1321334f9c.tar.gz sqlite-1c1cea8baec472eb39ae92d92e2b9b1321334f9c.zip |
Merge latest trunk changes into this branch.
FossilOrigin-Name: 82e5a6e088c58815140ad36715ac11c96527cb25
Diffstat (limited to 'src/resolve.c')
-rw-r--r-- | src/resolve.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/resolve.c b/src/resolve.c index b75db42ef..23636eace 100644 --- a/src/resolve.c +++ b/src/resolve.c @@ -99,7 +99,6 @@ static void resolveAlias( assert( iCol>=0 && iCol<pEList->nExpr ); pOrig = pEList->a[iCol].pExpr; assert( pOrig!=0 ); - assert( (pOrig->flags & EP_Resolved)!=0 || zType[0]==0 ); db = pParse->db; pDup = sqlite3ExprDup(db, pOrig, 0); if( pDup==0 ) return; |