/ Check-in [867b3e3b]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment: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.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 867b3e3b29a357f68e48f0898bf323c5dd0575a4
User & Date: drh 2013-05-15 17:47:12
Context
2013-05-15
18:45
Update the sessions branch with the latest trunk changes. check-in: d0935505 user: drh tags: sessions
18:34
Fixes to allow testfixture to be compiled with SQLITE_OMIT_VIRTUAL_TABLE defined. check-in: 00231fb0 user: dan tags: trunk
17:47
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. check-in: 867b3e3b user: drh tags: trunk
17:08
Make sure an sqlite3_close() or a rollback on one shared-cache connection does not disrupt the operation of other connections using the same shared cache. Fix for ticket [e636a050b709]. check-in: 5cc1cc55 user: drh tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/expr.c.

   112    112       int op = p->op;
   113    113       if( op==TK_CAST || op==TK_UPLUS ){
   114    114         p = p->pLeft;
   115    115         continue;
   116    116       }
   117    117       assert( op!=TK_REGISTER || p->op2!=TK_COLLATE );
   118    118       if( op==TK_COLLATE ){
   119         -      if( db->init.busy ){
   120         -        /* Do not report errors when parsing while the schema */
   121         -        pColl = sqlite3FindCollSeq(db, ENC(db), p->u.zToken, 0);
   122         -      }else{
   123         -        pColl = sqlite3GetCollSeq(pParse, ENC(db), 0, p->u.zToken);
   124         -      }
          119  +      pColl = sqlite3GetCollSeq(pParse, ENC(db), 0, p->u.zToken);
   125    120         break;
   126    121       }
   127    122       if( p->pTab!=0
   128    123        && (op==TK_AGG_COLUMN || op==TK_COLUMN
   129    124             || op==TK_REGISTER || op==TK_TRIGGER)
   130    125       ){
   131    126         /* op==TK_REGISTER && p->pTab!=0 happens when pExpr was originally