diff options
| author | drh <drh@noemail.net> | 2013-05-15 17:47:12 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2013-05-15 17:47:12 +0000 |
| commit | 6fdd3d8aa001c584c07096429a73d2bd8e52cb23 (patch) | |
| tree | d6c449b57d28c9c2d0edd2680865af41f9df84bb /src/expr.c | |
| parent | f7d2573d7c7d701427899eb80084b1fb634acfb8 (diff) | |
| download | sqlite-6fdd3d8aa001c584c07096429a73d2bd8e52cb23.tar.gz sqlite-6fdd3d8aa001c584c07096429a73d2bd8e52cb23.zip | |
The sqlite3ExprCollSeq() function can no longer be called while parse
the schema, so remove the code path inside of sqlite3ExprCollSeq() that
dealt with that case.
FossilOrigin-Name: 867b3e3b29a357f68e48f0898bf323c5dd0575a4
Diffstat (limited to 'src/expr.c')
| -rw-r--r-- | src/expr.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/expr.c b/src/expr.c index a974c5a61..660397e07 100644 --- a/src/expr.c +++ b/src/expr.c @@ -116,12 +116,7 @@ CollSeq *sqlite3ExprCollSeq(Parse *pParse, Expr *pExpr){ } assert( op!=TK_REGISTER || p->op2!=TK_COLLATE ); if( op==TK_COLLATE ){ - if( db->init.busy ){ - /* Do not report errors when parsing while the schema */ - pColl = sqlite3FindCollSeq(db, ENC(db), p->u.zToken, 0); - }else{ - pColl = sqlite3GetCollSeq(pParse, ENC(db), 0, p->u.zToken); - } + pColl = sqlite3GetCollSeq(pParse, ENC(db), 0, p->u.zToken); break; } if( p->pTab!=0 |