simplify the handler api - table_type() is no longer abstract, not even virtual

3 files changed, 1 insertions, 11 deletions

diff --git a/sql/ha_partition.cc b/sql/ha_partition.cc
index c139889a2f4..463a1678449 100644
--- a/sql/ha_partition.cc
+++ b/sql/ha_partition.cc
@@ -298,13 +298,6 @@ void ha_partition::init_handler_variables()
 }
 
 
-const char *ha_partition::table_type() const
-{ 
-  // we can do this since we only support a single engine type
-  return m_file[0]->table_type(); 
-}
-
-
 /*
   Destructor method
 
diff --git a/sql/ha_partition.h b/sql/ha_partition.h
index 86d43e3750f..71408324c1b 100644
--- a/sql/ha_partition.h
+++ b/sql/ha_partition.h
@@ -635,9 +635,6 @@ public:
   */
   virtual const char *index_type(uint inx);
 
-  /* The name of the table type that will be used for display purposes */
-  virtual const char *table_type() const;
-
   /* The name of the row type used for the underlying tables. */
   virtual enum row_type get_row_type() const;
 
diff --git a/sql/handler.h b/sql/handler.h
index 2731a198224..a7141246993 100644
--- a/sql/handler.h
+++ b/sql/handler.h
@@ -2408,7 +2408,7 @@ public:
   { return; }       /* prepare InnoDB for HANDLER */
   virtual void free_foreign_key_create_info(char* str) {}
   /** The following can be called without an open handler */
-  virtual const char *table_type() const =0;
+  const char *table_type() const { return hton_name(ht)->str; }
   /**
     If frm_error() is called then we will use this to find out what file
     extentions exist for the storage engine. This is also used by the default