diff --git a/include/mysql/plugin.h b/include/mysql/plugin.h index ae952ccab1e3d92513c4b23bbcad07925b585814..174c2b85739b58bcba0fcc2eeb44635ae5d4430a 100644 --- 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 diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc index 0739b7044626a8904223efac8bba31ff57c28e89..157af8250638c9bd4d0173da425a1bda6ba42ecc 100644 --- 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) { diff --git a/sql/ha_partition.cc b/sql/ha_partition.cc index e435b356def510440056b73516e3bc7d5894a411..8e704f34550839c787d085ad857ae12671c60a75 100644 --- 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) { diff --git a/sql/log.cc b/sql/log.cc index 9875b16f8e50dadec2239b408e584ec715dcdf19..9c2efb04a44883d75198d1d9da135a1980fe7338 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -4678,7 +4678,7 @@ err1: } struct st_mysql_storage_engine binlog_storage_engine= -{ MYSQL_HANDLERTON_INTERFACE_VERSION, binlog_hton }; +{ MYSQL_HANDLERTON_INTERFACE_VERSION }; mysql_declare_plugin(binlog) { diff --git a/storage/archive/ha_archive.cc b/storage/archive/ha_archive.cc index c31bbfd612e67b2d67bb1584aff31f80ca8553a3..3971c4d73f052df2677b201aea2764fbe1576bc7 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 bef5ee656fef3f8a07845cfdae18f7541eca3a4f..2ebe43acd4dcc22f58aa26aaba4ef5feafb8c10b 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 012e9b9bd7fd1cfbdc7d9794fb7fba6fa7751874..8007ebfecd1113c418ebdcd6153736a32b3b1255 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 c4c2524a118b5d40de837322fe64603e8593a472..1b49cbbae5a4437eec4c34101c571602ed1b6b43 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 3bb34e5aaccbbfebb2c072692506bb84c7c94861..ecfaa9dff2d3fa7436a7187c76d7392780761306 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 d550442b0ecc1f00cdf6eccc4d683be1d244d188..1b76b24bd5d320d311a0f85e0df6f2368abdbfca 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 84533d6c814caf1d818ec13d08f48b874d55dd43..8fa0424676934cb0044856c4ec54df1e0f7c37c5 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 28955bf90611650963094f028fb65b888e5928fa..da4b4307f218c5a2f2aa2153fe6236aa7d28fd3a 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 6ed07df101268d498e50526f3428d667e8042397..bc756e78023c8c433c5609567afad6b86d245903 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) {