Merge 10.9 into 10.10

1 files changed, 10 insertions, 1 deletions

diff --git a/sql/table.h b/sql/table.h
index ff9f93becbf..aeba303926a 100644
--- a/sql/table.h
+++ b/sql/table.h
@@ -1665,7 +1665,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
@@ -1680,6 +1684,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,