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

15 files changed, 1 insertions, 58 deletions

diff --git a/storage/archive/ha_archive.h b/storage/archive/ha_archive.h
index 165c7443070..d1c4bfbc7fb 100644
--- a/storage/archive/ha_archive.h
+++ b/storage/archive/ha_archive.h
@@ -82,7 +82,6 @@ public:
   ~ha_archive()
   {
   }
-  const char *table_type() const { return "ARCHIVE"; }
   const char *index_type(uint inx) { return "NONE"; }
   const char **bas_ext() const;
   ulonglong table_flags() const
diff --git a/storage/blackhole/ha_blackhole.h b/storage/blackhole/ha_blackhole.h
index a7efd261ddb..51857f3bb2a 100644
--- a/storage/blackhole/ha_blackhole.h
+++ b/storage/blackhole/ha_blackhole.h
@@ -46,8 +46,6 @@ public:
   ~ha_blackhole()
   {
   }
-  /* The name that will be used for display purposes */
-  const char *table_type() const { return "BLACKHOLE"; }
   /*
     The name of the index type that will be used for display
     don't implement this method unless you really have indexes
diff --git a/storage/csv/ha_tina.h b/storage/csv/ha_tina.h
index 88af2c9652c..26404b3a9e7 100644
--- a/storage/csv/ha_tina.h
+++ b/storage/csv/ha_tina.h
@@ -102,7 +102,6 @@ public:
       delete file_buff;
     free_root(&blobroot, MYF(0));
   }
-  const char *table_type() const { return "CSV"; }
   const char *index_type(uint inx) { return "NONE"; }
   const char **bas_ext() const;
   ulonglong table_flags() const
diff --git a/storage/example/ha_example.h b/storage/example/ha_example.h
index ca8ca5ff293..9be370edfe3 100644
--- a/storage/example/ha_example.h
+++ b/storage/example/ha_example.h
@@ -67,11 +67,6 @@ public:
   }
 
   /** @brief
-    The name that will be used for display purposes.
-   */
-  const char *table_type() const { return "EXAMPLE"; }
-
-  /** @brief
     The name of the index type that will be used for display.
     Don't implement this method unless you really have indexes.
    */
diff --git a/storage/federated/ha_federated.h b/storage/federated/ha_federated.h
index 98b0efdbe2b..6583d438c4d 100644
--- a/storage/federated/ha_federated.h
+++ b/storage/federated/ha_federated.h
@@ -124,8 +124,6 @@ private:
 public:
   ha_federated(handlerton *hton, TABLE_SHARE *table_arg);
   ~ha_federated() {}
-  /* The name that will be used for display purposes */
-  const char *table_type() const { return "FEDERATED"; }
   /*
     Next pointer used in transaction
   */
diff --git a/storage/federatedx/ha_federatedx.h b/storage/federatedx/ha_federatedx.h
index dc7733806ad..3af05387cb2 100644
--- a/storage/federatedx/ha_federatedx.h
+++ b/storage/federatedx/ha_federatedx.h
@@ -311,8 +311,6 @@ private:
 public:
   ha_federatedx(handlerton *hton, TABLE_SHARE *table_arg);
   ~ha_federatedx() {}
-  /* The name that will be used for display purposes */
-  const char *table_type() const { return "FEDERATED"; }
   /*
     The name of the index type that will be used for display
     don't implement this method unless you really have indexes
diff --git a/storage/heap/ha_heap.h b/storage/heap/ha_heap.h
index c5b8a09b216..30ad06e2c06 100644
--- a/storage/heap/ha_heap.h
+++ b/storage/heap/ha_heap.h
@@ -38,11 +38,6 @@ public:
   ha_heap(handlerton *hton, TABLE_SHARE *table);
   ~ha_heap() {}
   handler *clone(const char *name, MEM_ROOT *mem_root);
-  const char *table_type() const
-  {
-    return (table->in_use->variables.sql_mode & MODE_MYSQL323) ?
-           "HEAP" : "MEMORY";
-  }
   const char *index_type(uint inx)
   {
     return ((table_share->key_info[inx].algorithm == HA_KEY_ALG_BTREE) ?
diff --git a/storage/maria/ha_maria.h b/storage/maria/ha_maria.h
index 545daca12fe..5cb57a17f52 100644
--- a/storage/maria/ha_maria.h
+++ b/storage/maria/ha_maria.h
@@ -59,8 +59,6 @@ public:
   ha_maria(handlerton *hton, TABLE_SHARE * table_arg);
   ~ha_maria() {}
   handler *clone(const char *name, MEM_ROOT *mem_root);
-  const char *table_type() const
-  { return "Aria"; }
   const char *index_type(uint key_number);
   const char **bas_ext() const;
   ulonglong table_flags() const
diff --git a/storage/myisam/ha_myisam.h b/storage/myisam/ha_myisam.h
index 79324f64370..9d45d146582 100644
--- a/storage/myisam/ha_myisam.h
+++ b/storage/myisam/ha_myisam.h
@@ -56,7 +56,6 @@ class ha_myisam: public handler
   ha_myisam(handlerton *hton, TABLE_SHARE *table_arg);
   ~ha_myisam() {}
   handler *clone(const char *name, MEM_ROOT *mem_root);
-  const char *table_type() const { return "MyISAM"; }
   const char *index_type(uint key_number);
   const char **bas_ext() const;
   ulonglong table_flags() const { return int_table_flags; }
diff --git a/storage/myisammrg/ha_myisammrg.cc b/storage/myisammrg/ha_myisammrg.cc
index 2c1e85ec9ff..c124d5cc690 100644
--- a/storage/myisammrg/ha_myisammrg.cc
+++ b/storage/myisammrg/ha_myisammrg.cc
@@ -1717,28 +1717,11 @@ static int myisammrg_init(void *p)
 struct st_mysql_storage_engine myisammrg_storage_engine=
 { MYSQL_HANDLERTON_INTERFACE_VERSION };
 
-mysql_declare_plugin(myisammrg)
-{
-  MYSQL_STORAGE_ENGINE_PLUGIN,
-  &myisammrg_storage_engine,
-  "MRG_MYISAM",
-  "MySQL AB",
-  "Collection of identical MyISAM tables",
-  PLUGIN_LICENSE_GPL,
-  myisammrg_init, /* Plugin Init */
-  NULL, /* Plugin Deinit */
-  0x0100, /* 1.0 */
-  NULL,                       /* status variables                */
-  NULL,                       /* system variables                */
-  NULL,                       /* config options                  */
-  0,                          /* flags                           */
-}
-mysql_declare_plugin_end;
 maria_declare_plugin(myisammrg)
 {
   MYSQL_STORAGE_ENGINE_PLUGIN,
   &myisammrg_storage_engine,
-  "MRG_MYISAM",
+  "MRG_MyISAM",
   "MySQL AB",
   "Collection of identical MyISAM tables",
   PLUGIN_LICENSE_GPL,
diff --git a/storage/myisammrg/ha_myisammrg.h b/storage/myisammrg/ha_myisammrg.h
index f5ba2ffef38..8007e7d04e8 100644
--- a/storage/myisammrg/ha_myisammrg.h
+++ b/storage/myisammrg/ha_myisammrg.h
@@ -82,7 +82,6 @@ public:
 
   ha_myisammrg(handlerton *hton, TABLE_SHARE *table_arg);
   ~ha_myisammrg();
-  const char *table_type() const { return "MRG_MyISAM"; }
   const char **bas_ext() const;
   const char *index_type(uint key_number);
   ulonglong table_flags() const
diff --git a/storage/oqgraph/ha_oqgraph.h b/storage/oqgraph/ha_oqgraph.h
index 97f8cb54081..ee88e38c526 100644
--- a/storage/oqgraph/ha_oqgraph.h
+++ b/storage/oqgraph/ha_oqgraph.h
@@ -62,10 +62,6 @@ public:
   Table_flags table_flags() const;
 #endif
   ~ha_oqgraph() {}
-  const char *table_type() const
-  {
-    return "OQGRAPH";
-  }
   const char *index_type(uint inx)
   {
     return "HASH";
diff --git a/storage/perfschema/ha_perfschema.h b/storage/perfschema/ha_perfschema.h
index 17ab601e60f..35670339599 100644
--- a/storage/perfschema/ha_perfschema.h
+++ b/storage/perfschema/ha_perfschema.h
@@ -42,8 +42,6 @@ public:
 
   ~ha_perfschema();
 
-  const char *table_type(void) const { return pfs_engine_name; }
-
   const char *index_type(uint) { return ""; }
 
   const char **bas_ext(void) const;
diff --git a/storage/xtradb/handler/ha_innodb.cc b/storage/xtradb/handler/ha_innodb.cc
index 965863eb2d2..58c92366b81 100644
--- a/storage/xtradb/handler/ha_innodb.cc
+++ b/storage/xtradb/handler/ha_innodb.cc
@@ -4005,17 +4005,6 @@ static const char* ha_innobase_exts[] = {
 };
 
 /****************************************************************//**
-Returns the table type (storage engine name).
-@return	table type */
-UNIV_INTERN
-const char*
-ha_innobase::table_type() const
-/*===========================*/
-{
-	return(innobase_hton_name);
-}
-
-/****************************************************************//**
 Returns the index type. */
 UNIV_INTERN
 const char*
diff --git a/storage/xtradb/handler/ha_innodb.h b/storage/xtradb/handler/ha_innodb.h
index 933d75cf0d2..4d9c0a1ab35 100644
--- a/storage/xtradb/handler/ha_innodb.h
+++ b/storage/xtradb/handler/ha_innodb.h
@@ -123,7 +123,6 @@ class ha_innobase: public handler
 	*/
 	enum row_type get_row_type() const;
 
-	const char* table_type() const;
 	const char* index_type(uint key_number);
 	const char** bas_ext() const;
 	Table_flags table_flags() const;