Index: src/where.c
==================================================================
--- src/where.c
+++ src/where.c
@@ -5792,20 +5792,20 @@
   if( pResultSet!=0 && pWInfo->nLevel>=2 ){
     Bitmask tabUsed = exprListTableUsage(pMaskSet, pResultSet);
     if( pOrderBy ) tabUsed |= exprListTableUsage(pMaskSet, pOrderBy);
     while( pWInfo->nLevel>=2 ){
       pLoop = pWInfo->a[pWInfo->nLevel-1].pWLoop;
-      if( ((wctrlFlags & WHERE_WANT_DISTINCT)!=0
-           || (pLoop->wsFlags & WHERE_ONEROW)!=0)
-       && (tabUsed & pLoop->maskSelf)==0
+      if( (pWInfo->pTabList->a[pLoop->iTab].jointype & JT_LEFT)==0 ) break;
+      if( (wctrlFlags & WHERE_WANT_DISTINCT)==0
+       && (pLoop->wsFlags & WHERE_ONEROW)==0
       ){
-        WHERETRACE(0xffff, ("-> drop loop %c not used\n", pLoop->cId));
-        pWInfo->nLevel--;
-        nTabList--;
-      }else{
         break;
       }
+      if( (tabUsed & pLoop->maskSelf)!=0 ) break;
+      WHERETRACE(0xffff, ("-> drop loop %c not used\n", pLoop->cId));
+      pWInfo->nLevel--;
+      nTabList--;
     }
   }
   WHERETRACE(0xffff,("*** Optimizer Finished ***\n"));
   pWInfo->pParse->nQueryLoop += pWInfo->nRowOut;