Index: src/expr.c
==================================================================
--- src/expr.c
+++ src/expr.c
@@ -104,26 +104,18 @@
         pColl = sqlite3FindCollSeq(db, ENC(db), zColl, 0);
       }
       break;
     }
     if( p->flags & EP_Collate ){
-      if( p->pLeft->flags & EP_Collate ){
+      if( p->pLeft && (p->pLeft->flags & EP_Collate)!=0 ){
         p = p->pLeft;
       }else{
         p = p->pRight;
       }
     }else{
       break;
     }
-#if 0
-    else if( p->flags & EP_TokenOnly ){
-      break;
-    }else{
-      pColl = sqlite3ExprCollSeq(pParse, p->pLeft);
-      p = p->pRight;
-    }
-#endif
   }
   if( sqlite3CheckCollSeq(pParse, pColl) ){ 
     pColl = 0;
   }
   return pColl;
@@ -3353,11 +3345,11 @@
   }
   if( isAppropriateForFactoring(pExpr) ){
     int r1 = ++pParse->nMem;
     int r2;
     r2 = sqlite3ExprCodeTarget(pParse, pExpr, r1);
-    if( NEVER(r1!=r2) ) sqlite3ReleaseTempReg(pParse, r1);
+    if( r1!=r2 ) sqlite3ReleaseTempReg(pParse, r1);
     pExpr->op2 = pExpr->op;
     pExpr->op = TK_REGISTER;
     pExpr->iTable = r2;
     return WRC_Prune;
   }
@@ -3793,10 +3785,11 @@
     if( ExprHasProperty(pB, EP_IntValue) || NEVER(pB->u.zToken==0) ) return 2;
     if( strcmp(pA->u.zToken,pB->u.zToken)!=0 ){
       return pA->op==TK_COLLATE ? 1 : 2;
     }
   }
+  if( (pA->flags&EP_Collate)!=(pB->flags&EP_Collate) ) return 1;
   return 0;
 }
 
 /*
 ** Compare two ExprList objects.  Return 0 if they are identical and 

Index: src/fkey.c
==================================================================
--- src/fkey.c
+++ src/fkey.c
@@ -509,16 +509,21 @@
     if( pLeft ){
       /* Set the collation sequence and affinity of the LHS of each TK_EQ
       ** expression to the parent key column defaults.  */
       if( pIdx ){
         Column *pCol;
+        Expr *pNew;
+        Token s;
         iCol = pIdx->aiColumn[i];
         pCol = &pTab->aCol[iCol];
         if( pTab->iPKey==iCol ) iCol = -1;
         pLeft->iTable = regData+iCol+1;
         pLeft->affinity = pCol->affinity;
-        // fix me.  pLeft->pColl = sqlite3LocateCollSeq(pParse, pCol->zColl);
+        s.z = pCol->zColl;
+        s.n = sqlite3Strlen30(s.z);
+        pNew = sqlite3ExprSetCollByToken(pParse, pLeft, &s);
+        if( pNew ) pLeft = pNew;
       }else{
         pLeft->iTable = regData;
         pLeft->affinity = SQLITE_AFF_INTEGER;
       }
     }

Index: src/resolve.c
==================================================================
--- src/resolve.c
+++ src/resolve.c
@@ -112,10 +112,11 @@
     if( pDup==0 ) return;
     assert( (pDup->flags & (EP_Reduced|EP_TokenOnly))==0 );
     pDup->flags2 |= EP2_MallocedToken;
     pDup->u.zToken = sqlite3DbStrDup(db, zToken);
   }
+  pDup->flags |= EP_Collate & pExpr->flags;
 
   /* Before calling sqlite3ExprDelete(), set the EP_Static flag. This 
   ** prevents ExprDelete() from deleting the Expr structure itself,
   ** allowing it to be repopulated by the memcpy() on the following line.
   */

Index: src/select.c
==================================================================
--- src/select.c
+++ src/select.c
@@ -2335,10 +2335,11 @@
         Expr *pTerm = pOrderBy->a[i].pExpr;
         if( pTerm->flags & EP_Collate ){
           pColl = sqlite3ExprCollSeq(pParse, pTerm);
         }else{
           pColl = multiSelectCollSeq(pParse, p, aPermute[i]);
+          pTerm->flags |= EP_Collate;
         }
         pKeyMerge->aColl[i] = pColl;
         pKeyMerge->aSortOrder[i] = pOrderBy->a[i].sortOrder;
       }
     }

Index: src/where.c
==================================================================
--- src/where.c
+++ src/where.c
@@ -663,11 +663,11 @@
           ** it to be useful for optimising expression pX. Store this
           ** value in variable pColl.
           */
           assert(pX->pLeft);
           pColl = sqlite3BinaryCompareCollSeq(pParse, pX->pLeft, pX->pRight);
-          assert(pColl || pParse->nErr);
+          if( pColl==0 ) pColl = pParse->db->pDfltColl;
   
           for(j=0; pIdx->aiColumn[j]!=iColumn; j++){
             if( NEVER(j>=pIdx->nColumn) ) return 0;
           }
           if( pColl && sqlite3StrICmp(pColl->zName, pIdx->azColl[j]) ) continue;