1 files changed, 3 insertions, 7 deletions
diff --git a/src/dbstat.c b/src/dbstat.c
index 262da7c37..d0ce82e8c 100644
--- a/src/dbstat.c
+++ b/src/dbstat.c
@@ -237,18 +237,14 @@ static int statBestIndex(sqlite3_vtab *tab, sqlite3_index_info *pIdxInfo){
   i = 0;
   if( iSchema>=0 ){
     pIdxInfo->aConstraintUsage[iSchema].argvIndex = ++i;
-    pIdxInfo->aConstraintUsage[iSchema].omit = 1;
     pIdxInfo->idxNum |= 0x01;
   }
   if( iName>=0 ){
     pIdxInfo->aConstraintUsage[iName].argvIndex = ++i;
-    pIdxInfo->aConstraintUsage[iName].omit = 1;
     pIdxInfo->idxNum |= 0x02;
   }
   if( iAgg>=0 ){
     pIdxInfo->aConstraintUsage[iAgg].argvIndex = ++i;
-    /* As of ticket [727074e2], this constraint is not omitted. */
-    /* pIdxInfo->aConstraintUsage[iAgg].omit = 1; */
     pIdxInfo->idxNum |= 0x04;
   }
   pIdxInfo->estimatedCost = 1.0;
@@ -704,9 +700,9 @@ static int statFilter(
     const char *zDbase = (const char*)sqlite3_value_text(argv[iArg++]);
     pCsr->iDb = sqlite3FindDbName(pTab->db, zDbase);
     if( pCsr->iDb<0 ){
-      sqlite3_free(pCursor->pVtab->zErrMsg);
-      pCursor->pVtab->zErrMsg = sqlite3_mprintf("no such schema: %s", zDbase);
-      return pCursor->pVtab->zErrMsg ? SQLITE_ERROR : SQLITE_NOMEM_BKPT;
+      pCsr->iDb = 0;
+      pCsr->isEof = 1;
+      return SQLITE_OK;
     }
   }else{
     pCsr->iDb = pTab->iDb;