diff options
| author | dan <dan@noemail.net> | 2013-08-21 12:04:32 +0000 |
|---|---|---|
| committer | dan <dan@noemail.net> | 2013-08-21 12:04:32 +0000 |
| commit | 36e78309deb9b123644833e2a5016d8ed561877b (patch) | |
| tree | 46fe39277e05b24238727c7957262d1cce0b5a0e /src/expr.c | |
| parent | 22c745a9c958ee24832ff2bf7d1764db2223ccd1 (diff) | |
| download | sqlite-36e78309deb9b123644833e2a5016d8ed561877b.tar.gz sqlite-36e78309deb9b123644833e2a5016d8ed561877b.zip | |
Candidate fix for [d666d600a6].
FossilOrigin-Name: 781592f32c8e1dcd59954c17211cf61349d1c0b1
Diffstat (limited to 'src/expr.c')
| -rw-r--r-- | src/expr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/expr.c b/src/expr.c index e857193b8..dd4f5de15 100644 --- a/src/expr.c +++ b/src/expr.c @@ -114,8 +114,7 @@ CollSeq *sqlite3ExprCollSeq(Parse *pParse, Expr *pExpr){ p = p->pLeft; continue; } - assert( op!=TK_REGISTER || p->op2!=TK_COLLATE ); - if( op==TK_COLLATE ){ + if( op==TK_COLLATE || (op==TK_REGISTER && p->op2==TK_COLLATE) ){ pColl = sqlite3GetCollSeq(pParse, ENC(db), 0, p->u.zToken); break; } @@ -3505,6 +3504,7 @@ static void exprCodeBetween( compRight.pLeft = &exprX; compRight.pRight = pExpr->x.pList->a[1].pExpr; exprX.iTable = sqlite3ExprCodeTemp(pParse, &exprX, ®Free1); + exprX.op2 = exprX.op; exprX.op = TK_REGISTER; if( jumpIfTrue ){ sqlite3ExprIfTrue(pParse, &exprAnd, dest, jumpIfNull); |