diff options
-rw-r--r-- | plugin/feedback/feedback.cc | 19 | ||||
-rw-r--r-- | plugin/metadata_lock_info/metadata_lock_info.cc | 22 | ||||
-rw-r--r-- | storage/blackhole/ha_blackhole.cc | 17 | ||||
-rw-r--r-- | storage/example/ha_example.cc | 17 | ||||
-rw-r--r-- | storage/federated/ha_federated.cc | 17 | ||||
-rw-r--r-- | storage/heap/ha_heap.cc | 17 | ||||
-rw-r--r-- | storage/myisam/ha_myisam.cc | 17 | ||||
-rw-r--r-- | storage/perfschema/ha_perfschema.cc | 18 |
8 files changed, 0 insertions, 144 deletions
diff --git a/plugin/feedback/feedback.cc b/plugin/feedback/feedback.cc index 03cc4ab465a..eb3f562f329 100644 --- a/plugin/feedback/feedback.cc +++ b/plugin/feedback/feedback.cc @@ -409,24 +409,6 @@ static struct st_mysql_information_schema feedback = } // namespace feedback -mysql_declare_plugin(feedback) -{ - MYSQL_INFORMATION_SCHEMA_PLUGIN, - &feedback::feedback, - "FEEDBACK", - "Sergei Golubchik", - "MariaDB User Feedback Plugin", - PLUGIN_LICENSE_GPL, - feedback::init, - feedback::free, - 0x0101, - NULL, - feedback::settings, - NULL, - 0 -} -mysql_declare_plugin_end; -#ifdef MARIA_PLUGIN_INTERFACE_VERSION maria_declare_plugin(feedback) { MYSQL_INFORMATION_SCHEMA_PLUGIN, @@ -444,4 +426,3 @@ maria_declare_plugin(feedback) MariaDB_PLUGIN_MATURITY_STABLE } maria_declare_plugin_end; -#endif diff --git a/plugin/metadata_lock_info/metadata_lock_info.cc b/plugin/metadata_lock_info/metadata_lock_info.cc index 46c31ca3a96..a85048de47f 100644 --- a/plugin/metadata_lock_info/metadata_lock_info.cc +++ b/plugin/metadata_lock_info/metadata_lock_info.cc @@ -125,7 +125,6 @@ static int i_s_metadata_lock_info_deinit( static struct st_mysql_information_schema i_s_metadata_lock_info_plugin = { MYSQL_INFORMATION_SCHEMA_INTERFACE_VERSION }; -#ifdef MARIADB_BASE_VERSION maria_declare_plugin(metadata_lock_info) { MYSQL_INFORMATION_SCHEMA_PLUGIN, @@ -143,24 +142,3 @@ maria_declare_plugin(metadata_lock_info) MariaDB_PLUGIN_MATURITY_STABLE } maria_declare_plugin_end; -#else -mysql_declare_plugin(metadata_lock_info) -{ - MYSQL_INFORMATION_SCHEMA_PLUGIN, - &i_s_metadata_lock_info_plugin, - "METADATA_LOCK_INFO", - "Kentoku Shiba", - "Metadata locking viewer", - PLUGIN_LICENSE_GPL, - i_s_metadata_lock_info_init, - i_s_metadata_lock_info_deinit, - 0x0001, - NULL, - NULL, - NULL, -#if MYSQL_VERSION_ID >= 50600 - 0, -#endif -} -mysql_declare_plugin_end; -#endif diff --git a/storage/blackhole/ha_blackhole.cc b/storage/blackhole/ha_blackhole.cc index 82ac9123d3b..c4eba8b4171 100644 --- a/storage/blackhole/ha_blackhole.cc +++ b/storage/blackhole/ha_blackhole.cc @@ -423,23 +423,6 @@ static int blackhole_fini(void *p) struct st_mysql_storage_engine blackhole_storage_engine= { MYSQL_HANDLERTON_INTERFACE_VERSION }; -mysql_declare_plugin(blackhole) -{ - MYSQL_STORAGE_ENGINE_PLUGIN, - &blackhole_storage_engine, - "BLACKHOLE", - "MySQL AB", - "/dev/null storage engine (anything you write to it disappears)", - PLUGIN_LICENSE_GPL, - blackhole_init, /* Plugin Init */ - blackhole_fini, /* Plugin Deinit */ - 0x0100 /* 1.0 */, - NULL, /* status variables */ - NULL, /* system variables */ - NULL, /* config options */ - 0, /* flags */ -} -mysql_declare_plugin_end; maria_declare_plugin(blackhole) { MYSQL_STORAGE_ENGINE_PLUGIN, diff --git a/storage/example/ha_example.cc b/storage/example/ha_example.cc index f6760c06f2d..30484a41087 100644 --- a/storage/example/ha_example.cc +++ b/storage/example/ha_example.cc @@ -1094,23 +1094,6 @@ static struct st_mysql_show_var func_status[]= struct st_mysql_daemon unusable_example= { MYSQL_DAEMON_INTERFACE_VERSION }; -mysql_declare_plugin(example) -{ - MYSQL_STORAGE_ENGINE_PLUGIN, - &example_storage_engine, - "EXAMPLE", - "Brian Aker, MySQL AB", - "Example storage engine", - PLUGIN_LICENSE_GPL, - example_init_func, /* Plugin Init */ - NULL, /* Plugin Deinit */ - 0x0001 /* 0.1 */, - func_status, /* status variables */ - example_system_variables, /* system variables */ - NULL, /* config options */ - 0, /* flags */ -} -mysql_declare_plugin_end; maria_declare_plugin(example) { MYSQL_STORAGE_ENGINE_PLUGIN, diff --git a/storage/federated/ha_federated.cc b/storage/federated/ha_federated.cc index 766f9a2b790..c0e5c330edb 100644 --- a/storage/federated/ha_federated.cc +++ b/storage/federated/ha_federated.cc @@ -3390,23 +3390,6 @@ int ha_federated::execute_simple_query(const char *query, int len) struct st_mysql_storage_engine federated_storage_engine= { MYSQL_HANDLERTON_INTERFACE_VERSION }; -mysql_declare_plugin(federated) -{ - MYSQL_STORAGE_ENGINE_PLUGIN, - &federated_storage_engine, - "FEDERATED", - "Patrick Galbraith and Brian Aker, MySQL AB", - "Federated MySQL storage engine", - PLUGIN_LICENSE_GPL, - federated_db_init, /* Plugin Init */ - federated_done, /* Plugin Deinit */ - 0x0100 /* 1.0 */, - NULL, /* status variables */ - NULL, /* system variables */ - NULL, /* config options */ - 0, /* flags */ -} -mysql_declare_plugin_end; maria_declare_plugin(federated) { MYSQL_STORAGE_ENGINE_PLUGIN, diff --git a/storage/heap/ha_heap.cc b/storage/heap/ha_heap.cc index 0e61bff1d8d..38996dd0c93 100644 --- a/storage/heap/ha_heap.cc +++ b/storage/heap/ha_heap.cc @@ -839,23 +839,6 @@ int ha_heap::find_unique_row(uchar *record, uint unique_idx) struct st_mysql_storage_engine heap_storage_engine= { MYSQL_HANDLERTON_INTERFACE_VERSION }; -mysql_declare_plugin(heap) -{ - MYSQL_STORAGE_ENGINE_PLUGIN, - &heap_storage_engine, - "MEMORY", - "MySQL AB", - "Hash based, stored in memory, useful for temporary tables", - PLUGIN_LICENSE_GPL, - heap_init, - NULL, - 0x0100, /* 1.0 */ - NULL, /* status variables */ - NULL, /* system variables */ - NULL, /* config options */ - 0, /* flags */ -} -mysql_declare_plugin_end; maria_declare_plugin(heap) { MYSQL_STORAGE_ENGINE_PLUGIN, diff --git a/storage/myisam/ha_myisam.cc b/storage/myisam/ha_myisam.cc index e58ee9e31e4..92fb49bea8d 100644 --- a/storage/myisam/ha_myisam.cc +++ b/storage/myisam/ha_myisam.cc @@ -2648,23 +2648,6 @@ bool ha_myisam::rowid_filter_push(Rowid_filter* rowid_filter) struct st_mysql_storage_engine myisam_storage_engine= { MYSQL_HANDLERTON_INTERFACE_VERSION }; -mysql_declare_plugin(myisam) -{ - MYSQL_STORAGE_ENGINE_PLUGIN, - &myisam_storage_engine, - "MyISAM", - "MySQL AB", - "MyISAM storage engine", - PLUGIN_LICENSE_GPL, - myisam_init, /* Plugin Init */ - NULL, /* Plugin Deinit */ - 0x0100, /* 1.0 */ - NULL, /* status variables */ - myisam_sysvars, /* system variables */ - NULL, - 0, -} -mysql_declare_plugin_end; maria_declare_plugin(myisam) { MYSQL_STORAGE_ENGINE_PLUGIN, diff --git a/storage/perfschema/ha_perfschema.cc b/storage/perfschema/ha_perfschema.cc index d36a7d7322a..1509936fe53 100644 --- a/storage/perfschema/ha_perfschema.cc +++ b/storage/perfschema/ha_perfschema.cc @@ -219,24 +219,6 @@ struct st_mysql_storage_engine pfs_storage_engine= const char* pfs_engine_name= "PERFORMANCE_SCHEMA"; -mysql_declare_plugin(perfschema) -{ - MYSQL_STORAGE_ENGINE_PLUGIN, - &pfs_storage_engine, - pfs_engine_name, - "Marc Alff, Oracle", /* Formerly Sun Microsystems, formerly MySQL */ - "Performance Schema", - PLUGIN_LICENSE_GPL, - pfs_init_func, /* Plugin Init */ - pfs_done_func, /* Plugin Deinit */ - 0x0001 /* 0.1 */, - pfs_status_vars, /* status variables */ - NULL, /* system variables */ - NULL, /* config options */ - 0, /* flags */ -} -mysql_declare_plugin_end; - maria_declare_plugin(perfschema) { MYSQL_STORAGE_ENGINE_PLUGIN, |