Removed Field (this came in as an idea from a previous patch by Serg)

include/mysql/plugin.h:
  Field Removed
sql/ha_ndbcluster.cc:
  Field Removed
sql/ha_partition.cc:
  Field Removed
sql/log.cc:
  Removed Field
storage/archive/ha_archive.cc:
  Removed Field
storage/blackhole/ha_blackhole.cc:
  Removed Field
storage/csv/ha_tina.cc:
  Removed Field
storage/example/ha_example.cc:
  Removed Field
storage/federated/ha_federated.cc:
  Removed Field
storage/heap/ha_heap.cc:
  Removed Field
storage/innobase/handler/ha_innodb.cc:
  Removed Field
storage/myisam/ha_myisam.cc:
  Removed Field
storage/myisammrg/ha_myisammrg.cc:
  Removed Field

9 files changed, 9 insertions, 9 deletions

diff --git a/storage/archive/ha_archive.cc b/storage/archive/ha_archive.cc
index c31bbfd612e..3971c4d73f0 100644
--- a/storage/archive/ha_archive.cc
+++ b/storage/archive/ha_archive.cc
@@ -1571,7 +1571,7 @@ bool ha_archive::check_and_repair(THD *thd)
 }
 
 struct st_mysql_storage_engine archive_storage_engine=
-{ MYSQL_HANDLERTON_INTERFACE_VERSION, archive_hton };
+{ MYSQL_HANDLERTON_INTERFACE_VERSION };
 
 mysql_declare_plugin(archive)
 {
diff --git a/storage/blackhole/ha_blackhole.cc b/storage/blackhole/ha_blackhole.cc
index bef5ee656fe..2ebe43acd4d 100644
--- a/storage/blackhole/ha_blackhole.cc
+++ b/storage/blackhole/ha_blackhole.cc
@@ -212,7 +212,7 @@ static int blackhole_init(void *p)
 }
 
 struct st_mysql_storage_engine blackhole_storage_engine=
-{ MYSQL_HANDLERTON_INTERFACE_VERSION, blackhole_hton };
+{ MYSQL_HANDLERTON_INTERFACE_VERSION };
 
 mysql_declare_plugin(blackhole)
 {
diff --git a/storage/csv/ha_tina.cc b/storage/csv/ha_tina.cc
index 012e9b9bd7f..8007ebfecd1 100644
--- a/storage/csv/ha_tina.cc
+++ b/storage/csv/ha_tina.cc
@@ -1516,7 +1516,7 @@ bool ha_tina::check_if_incompatible_data(HA_CREATE_INFO *info,
 }
 
 struct st_mysql_storage_engine csv_storage_engine=
-{ MYSQL_HANDLERTON_INTERFACE_VERSION, tina_hton };
+{ MYSQL_HANDLERTON_INTERFACE_VERSION };
 
 mysql_declare_plugin(csv)
 {
diff --git a/storage/example/ha_example.cc b/storage/example/ha_example.cc
index c4c2524a118..1b49cbbae5a 100644
--- a/storage/example/ha_example.cc
+++ b/storage/example/ha_example.cc
@@ -703,7 +703,7 @@ int ha_example::create(const char *name, TABLE *table_arg,
 }
 
 struct st_mysql_storage_engine example_storage_engine=
-{ MYSQL_HANDLERTON_INTERFACE_VERSION, example_hton };
+{ MYSQL_HANDLERTON_INTERFACE_VERSION };
 
 
 mysql_declare_plugin(example)
diff --git a/storage/federated/ha_federated.cc b/storage/federated/ha_federated.cc
index 3bb34e5aacc..ecfaa9dff2d 100644
--- a/storage/federated/ha_federated.cc
+++ b/storage/federated/ha_federated.cc
@@ -2882,7 +2882,7 @@ int ha_federated::execute_simple_query(const char *query, int len)
 }
 
 struct st_mysql_storage_engine federated_storage_engine=
-{ MYSQL_HANDLERTON_INTERFACE_VERSION, federated_hton };
+{ MYSQL_HANDLERTON_INTERFACE_VERSION };
 
 mysql_declare_plugin(federated)
 {
diff --git a/storage/heap/ha_heap.cc b/storage/heap/ha_heap.cc
index d550442b0ec..1b76b24bd5d 100644
--- a/storage/heap/ha_heap.cc
+++ b/storage/heap/ha_heap.cc
@@ -701,7 +701,7 @@ bool ha_heap::check_if_incompatible_data(HA_CREATE_INFO *info,
 }
 
 struct st_mysql_storage_engine heap_storage_engine=
-{ MYSQL_HANDLERTON_INTERFACE_VERSION, heap_hton};
+{ MYSQL_HANDLERTON_INTERFACE_VERSION };
 
 mysql_declare_plugin(heap)
 {
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
index 84533d6c814..8fa04246769 100644
--- a/storage/innobase/handler/ha_innodb.cc
+++ b/storage/innobase/handler/ha_innodb.cc
@@ -7607,7 +7607,7 @@ SHOW_VAR innodb_status_variables_export[]= {
 };
 
 struct st_mysql_storage_engine innobase_storage_engine=
-{ MYSQL_HANDLERTON_INTERFACE_VERSION, innobase_hton};
+{ MYSQL_HANDLERTON_INTERFACE_VERSION };
 
 mysql_declare_plugin(innobase)
 {
diff --git a/storage/myisam/ha_myisam.cc b/storage/myisam/ha_myisam.cc
index 28955bf9061..da4b4307f21 100644
--- a/storage/myisam/ha_myisam.cc
+++ b/storage/myisam/ha_myisam.cc
@@ -1801,7 +1801,7 @@ static int myisam_init(void *p)
 }
 
 struct st_mysql_storage_engine myisam_storage_engine=
-{ MYSQL_HANDLERTON_INTERFACE_VERSION, myisam_hton };
+{ MYSQL_HANDLERTON_INTERFACE_VERSION };
 
 mysql_declare_plugin(myisam)
 {
diff --git a/storage/myisammrg/ha_myisammrg.cc b/storage/myisammrg/ha_myisammrg.cc
index 6ed07df1012..bc756e78023 100644
--- a/storage/myisammrg/ha_myisammrg.cc
+++ b/storage/myisammrg/ha_myisammrg.cc
@@ -568,7 +568,7 @@ static int myisammrg_init(void *p)
 }
 
 struct st_mysql_storage_engine myisammrg_storage_engine=
-{ MYSQL_HANDLERTON_INTERFACE_VERSION, myisammrg_hton };
+{ MYSQL_HANDLERTON_INTERFACE_VERSION };
 
 mysql_declare_plugin(myisammrg)
 {