Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1

into zim.(none):/home/brian/mysql/merge-5.1 storage/csv/ha_tina.cc: Auto merged storage/myisam/ha_myisam.cc: Auto merged

Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1
into zim.(none):/home/brian/mysql/merge-5.1 storage/csv/ha_tina.cc: Auto merged storage/myisam/ha_myisam.cc: Auto merged
782ae6d9 · unknown · 614235d5 · 1c5ceab7 · 782ae6d9 · 782ae6d9
Commit 782ae6d9 authored Sep 28, 2006 by unknown
13 changed files
--- a/include/mysql/plugin.h
+++ b/include/mysql/plugin.h
@@ -301,7 +301,6 @@ struct st_mysql_ftparser
 struct st_mysql_storage_engine
 {
  int interface_version;
-  struct handlerton *handlerton;
 };

 #endif

--- a/sql/ha_ndbcluster.cc
+++ b/sql/ha_ndbcluster.cc
@@ -10749,7 +10749,7 @@ SHOW_VAR ndb_status_variables_export[]= {
 };

 struct st_mysql_storage_engine ndbcluster_storage_engine=
-{ MYSQL_HANDLERTON_INTERFACE_VERSION, ndbcluster_hton };
+{ MYSQL_HANDLERTON_INTERFACE_VERSION };

 mysql_declare_plugin(ndbcluster)
 {

--- a/sql/ha_partition.cc
+++ b/sql/ha_partition.cc
@@ -5632,7 +5632,7 @@ static int free_share(PARTITION_SHARE *share)
 #endif /* NOT_USED */

 struct st_mysql_storage_engine partition_storage_engine=
-{ MYSQL_HANDLERTON_INTERFACE_VERSION, partition_hton };
+{ MYSQL_HANDLERTON_INTERFACE_VERSION };

 mysql_declare_plugin(partition)
 {

--- a/sql/log.cc
+++ b/sql/log.cc
@@ -4678,7 +4678,7 @@ int TC_LOG_BINLOG::recover(IO_CACHE *log, Format_description_log_event *fdle)
 }

 struct st_mysql_storage_engine binlog_storage_engine=
-{ MYSQL_HANDLERTON_INTERFACE_VERSION, binlog_hton };
+{ MYSQL_HANDLERTON_INTERFACE_VERSION };

 mysql_declare_plugin(binlog)
 {

--- 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)
 {

--- 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)
 {

--- 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)
 {

--- 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)

--- 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)
 {

--- 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)
 {

--- 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)
 {

--- 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)
 {

--- 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)
 {