4 files changed, 4 insertions, 8 deletions
diff --git a/src/callback.c b/src/callback.c
index 01b292b38..f8918bcf1 100644
--- a/src/callback.c
+++ b/src/callback.c
@@ -422,7 +422,6 @@ void sqlite3SchemaFree(void *p){
   sqlite3HashInit(&pSchema->tblHash);
   for(pElem=sqliteHashFirst(&temp1); pElem; pElem=sqliteHashNext(pElem)){
     Table *pTab = sqliteHashData(pElem);
-    assert( pTab->dbMem==0 );
     sqlite3DeleteTable(0, pTab);
   }
   sqlite3HashClear(&temp1);
diff --git a/src/fkey.c b/src/fkey.c
index ea71f49aa..217badffa 100644
--- a/src/fkey.c
+++ b/src/fkey.c
@@ -1061,11 +1061,7 @@ static Trigger *fkActionTrigger(
       pWhere = 0;
     }
 
-    /* In the current implementation, pTab->dbMem==0 for all tables except
-    ** for temporary tables used to describe subqueries.  And temporary
-    ** tables do not have foreign key constraints.  Hence, pTab->dbMem
-    ** should always be 0 there.
-    */
+    /* Disable lookaside memory allocation */
     enableLookaside = db->lookaside.bEnabled;
     db->lookaside.bEnabled = 0;
 
diff --git a/src/malloc.c b/src/malloc.c
index c7f8a191c..e34c27975 100644
--- a/src/malloc.c
+++ b/src/malloc.c
@@ -461,7 +461,8 @@ void sqlite3DbFree(sqlite3 *db, void *p){
     db->lookaside.pFree = pBuf;
     db->lookaside.nOut--;
   }else{
-    assert( sqlite3MemdebugHasType(p, MEMTYPE_DB|MEMTYPE_HEAP) );
+    assert( sqlite3MemdebugHasType(p,
+                       db ? (MEMTYPE_DB|MEMTYPE_HEAP) : MEMTYPE_HEAP) );
     sqlite3MemdebugSetType(p, MEMTYPE_HEAP);
     sqlite3_free(p);
   }
diff --git a/src/select.c b/src/select.c
index 3008276a7..b3aa3d7ca 100644
--- a/src/select.c
+++ b/src/select.c
@@ -1298,7 +1298,7 @@ Table *sqlite3ResultSetOfSelect(Parse *pParse, Select *pSelect){
     return 0;
   }
   /* The sqlite3ResultSetOfSelect() is only used n contexts where lookaside
-  ** is disabled, so we might as well hard-code pTab->dbMem to NULL. */
+  ** is disabled */
   assert( db->lookaside.bEnabled==0 );
   pTab->nRef = 1;
   pTab->zName = 0;