Index: src/build.c
==================================================================
--- src/build.c
+++ src/build.c
@@ -147,11 +147,11 @@
     ** (Bit 0 is for main, bit 1 is for temp, and so forth.)  Bits are
     ** set for each database that is used.  Generate code to start a
     ** transaction on each used database and to verify the schema cookie
     ** on each used database.
     */
-    if( db->mallocFailed==0 && pParse->cookieMask ){
+    if( db->mallocFailed==0 && (pParse->cookieMask || pParse->pConstExpr) ){
       yDbMask mask;
       int iDb, i;
       assert( sqlite3VdbeGetOp(v, 0)->opcode==OP_Init );
       sqlite3VdbeJumpHere(v, 0);
       for(iDb=0, mask=1; iDb<db->nDb; mask<<=1, iDb++){
@@ -3844,13 +3844,10 @@
     pToplevel->cookieMask |= mask;
     pToplevel->cookieValue[iDb] = db->aDb[iDb].pSchema->schema_cookie;
     if( !OMIT_TEMPDB && iDb==1 ){
       sqlite3OpenTempDatabase(pToplevel);
     }
-    if( pToplevel==pParse && OptimizationEnabled(db,SQLITE_FactorOutConst) ){
-      pParse->okConstFactor = 1;
-    }
   }
 }
 
 /*
 ** If argument zDb is NULL, then call sqlite3CodeVerifySchema() for each 

Index: src/select.c
==================================================================
--- src/select.c
+++ src/select.c
@@ -1614,10 +1614,16 @@
 Vdbe *sqlite3GetVdbe(Parse *pParse){
   Vdbe *v = pParse->pVdbe;
   if( v==0 ){
     v = pParse->pVdbe = sqlite3VdbeCreate(pParse);
     if( v ) sqlite3VdbeAddOp0(v, OP_Init);
+    if( pParse->pToplevel==0
+     && OptimizationEnabled(pParse->db,SQLITE_FactorOutConst)
+    ){
+      pParse->okConstFactor = 1;
+    }
+
   }
   return v;
 }