diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index b03763e0d17..89270430041 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -20320,6 +20320,8 @@ free_tmp_table(THD *thd, TABLE *entry)
     }
     entry->file->ha_drop_table(entry->s->path.str);
     delete entry->file;
+    entry->file= NULL;
+    entry->reset_created();
   }
 
   /* free blobs */
diff --git a/sql/table.h b/sql/table.h
index 70198ed5fdc..d704f3ce05e 100644
--- a/sql/table.h
+++ b/sql/table.h
@@ -1643,7 +1643,11 @@ public:
   }
 
   /// Return true if table is instantiated, and false otherwise.
-  bool is_created() const { return created; }
+  bool is_created() const
+  {
+    DBUG_ASSERT(!created || file != 0);
+    return created;
+  }
 
   /**
     Set the table as "created", and enable flags in storage engine
@@ -1658,6 +1662,11 @@ public:
     created= true;
   }
 
+  void reset_created()
+  {
+    created= 0;
+  }
+
   /*
     Returns TRUE if the table is filled at execution phase (and so, the
     optimizer must not do anything that depends on the contents of the table,