Index: src/where.c
==================================================================
--- src/where.c
+++ src/where.c
@@ -3022,16 +3022,21 @@
 ** scan loop run twice, once for strings and a second time for BLOBs.
 ** The OP_String opcodes on the second pass convert the upper and lower
 ** bound string contants to blobs.  This routine makes the necessary changes
 ** to the OP_String opcodes for that to happen.
 */
-static void whereLikeOptimizationStringFixup(Vdbe *v, WhereLevel *pLevel){
-  VdbeOp *pOp;
-  pOp = sqlite3VdbeGetOp(v, -1);
-  if( pLevel->iLikeRepCntr && pOp->opcode==OP_String8 ){
-    pOp->p3 = pLevel->iLikeRepCntr;
-    pOp->p5 = 1;
+static void whereLikeOptimizationStringFixup(
+  Vdbe *v,                /* prepared statement under construction */
+  WhereLevel *pLevel,     /* The loop that contains the LIKE operator */
+  WhereTerm *pTerm        /* The upper or lower bound just coded */
+){
+  if( pTerm->wtFlags & TERM_LIKEOPT ){
+    VdbeOp *pOp = sqlite3VdbeGetOp(v, -1);
+    if( pLevel->iLikeRepCntr && pOp->opcode==OP_String8 ){
+      pOp->p3 = pLevel->iLikeRepCntr;
+      pOp->p5 = 1;
+    }
   }
 }
 
 /*
 ** Generate code for the start of the iLevel-th loop in the WHERE clause
@@ -3363,13 +3368,12 @@
       nExtraReg = 1;
     }
     if( pLoop->wsFlags & WHERE_TOP_LIMIT ){
       pRangeEnd = pLoop->aLTerm[j++];
       nExtraReg = 1;
-      if( pRangeStart
-       && (pRangeStart->wtFlags & TERM_LIKEOPT)!=0
-       && (pRangeEnd->wtFlags & TERM_LIKEOPT)!=0
+      if( (pRangeStart && (pRangeStart->wtFlags & TERM_LIKEOPT)!=0)
+       || (pRangeEnd->wtFlags & TERM_LIKEOPT)!=0
       ){
         pLevel->iLikeRepCntr = ++pParse->nMem;
         testcase( bRev );
         testcase( pIdx->aSortOrder[nEq]==SQLITE_SO_DESC );
         sqlite3VdbeAddOp2(v, OP_Integer,
@@ -3418,11 +3422,11 @@
     /* Seek the index cursor to the start of the range. */
     nConstraint = nEq;
     if( pRangeStart ){
       Expr *pRight = pRangeStart->pExpr->pRight;
       sqlite3ExprCode(pParse, pRight, regBase+nEq);
-      whereLikeOptimizationStringFixup(v, pLevel);
+      whereLikeOptimizationStringFixup(v, pLevel, pRangeStart);
       if( (pRangeStart->wtFlags & TERM_VNULL)==0
        && sqlite3ExprCanBeNull(pRight)
       ){
         sqlite3VdbeAddOp2(v, OP_IsNull, regBase+nEq, addrNxt);
         VdbeCoverage(v);
@@ -3464,11 +3468,11 @@
     nConstraint = nEq;
     if( pRangeEnd ){
       Expr *pRight = pRangeEnd->pExpr->pRight;
       sqlite3ExprCacheRemove(pParse, regBase+nEq, 1);
       sqlite3ExprCode(pParse, pRight, regBase+nEq);
-      whereLikeOptimizationStringFixup(v, pLevel);
+      whereLikeOptimizationStringFixup(v, pLevel, pRangeEnd);
       if( (pRangeEnd->wtFlags & TERM_VNULL)==0
        && sqlite3ExprCanBeNull(pRight)
       ){
         sqlite3VdbeAddOp2(v, OP_IsNull, regBase+nEq, addrNxt);
         VdbeCoverage(v);