Skip to content

Commit 4876651

Browse files
vuvovavuvova
committed
remove mysql_declare_plugin declaration from some plugins
1 parent 7c2ba9e commit 4876651

File tree

8 files changed

+0
-144
lines changed

8 files changed

+0
-144
lines changed

‎plugin/feedback/feedback.cc

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -409,24 +409,6 @@ static struct st_mysql_information_schema feedback =
409409

410410
} // namespace feedback
411411

412-
mysql_declare_plugin(feedback)
413-
{
414-
MYSQL_INFORMATION_SCHEMA_PLUGIN,
415-
&feedback::feedback,
416-
"FEEDBACK",
417-
"Sergei Golubchik",
418-
"MariaDB User Feedback Plugin",
419-
PLUGIN_LICENSE_GPL,
420-
feedback::init,
421-
feedback::free,
422-
0x0101,
423-
NULL,
424-
feedback::settings,
425-
NULL,
426-
0
427-
}
428-
mysql_declare_plugin_end;
429-
#ifdef MARIA_PLUGIN_INTERFACE_VERSION
430412
maria_declare_plugin(feedback)
431413
{
432414
MYSQL_INFORMATION_SCHEMA_PLUGIN,
@@ -444,4 +426,3 @@ maria_declare_plugin(feedback)
444426
MariaDB_PLUGIN_MATURITY_STABLE
445427
}
446428
maria_declare_plugin_end;
447-
#endif

‎plugin/metadata_lock_info/metadata_lock_info.cc

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,6 @@ static int i_s_metadata_lock_info_deinit(
125125
static struct st_mysql_information_schema i_s_metadata_lock_info_plugin =
126126
{ MYSQL_INFORMATION_SCHEMA_INTERFACE_VERSION };
127127

128-
#ifdef MARIADB_BASE_VERSION
129128
maria_declare_plugin(metadata_lock_info)
130129
{
131130
MYSQL_INFORMATION_SCHEMA_PLUGIN,
@@ -143,24 +142,3 @@ maria_declare_plugin(metadata_lock_info)
143142
MariaDB_PLUGIN_MATURITY_STABLE
144143
}
145144
maria_declare_plugin_end;
146-
#else
147-
mysql_declare_plugin(metadata_lock_info)
148-
{
149-
MYSQL_INFORMATION_SCHEMA_PLUGIN,
150-
&i_s_metadata_lock_info_plugin,
151-
"METADATA_LOCK_INFO",
152-
"Kentoku Shiba",
153-
"Metadata locking viewer",
154-
PLUGIN_LICENSE_GPL,
155-
i_s_metadata_lock_info_init,
156-
i_s_metadata_lock_info_deinit,
157-
0x0001,
158-
NULL,
159-
NULL,
160-
NULL,
161-
#if MYSQL_VERSION_ID >= 50600
162-
0,
163-
#endif
164-
}
165-
mysql_declare_plugin_end;
166-
#endif

‎storage/blackhole/ha_blackhole.cc

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -423,23 +423,6 @@ static int blackhole_fini(void *p)
423423
struct st_mysql_storage_engine blackhole_storage_engine=
424424
{ MYSQL_HANDLERTON_INTERFACE_VERSION };
425425

426-
mysql_declare_plugin(blackhole)
427-
{
428-
MYSQL_STORAGE_ENGINE_PLUGIN,
429-
&blackhole_storage_engine,
430-
"BLACKHOLE",
431-
"MySQL AB",
432-
"/dev/null storage engine (anything you write to it disappears)",
433-
PLUGIN_LICENSE_GPL,
434-
blackhole_init, /* Plugin Init */
435-
blackhole_fini, /* Plugin Deinit */
436-
0x0100 /* 1.0 */,
437-
NULL, /* status variables */
438-
NULL, /* system variables */
439-
NULL, /* config options */
440-
0, /* flags */
441-
}
442-
mysql_declare_plugin_end;
443426
maria_declare_plugin(blackhole)
444427
{
445428
MYSQL_STORAGE_ENGINE_PLUGIN,

‎storage/example/ha_example.cc

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1094,23 +1094,6 @@ static struct st_mysql_show_var func_status[]=
10941094
struct st_mysql_daemon unusable_example=
10951095
{ MYSQL_DAEMON_INTERFACE_VERSION };
10961096

1097-
mysql_declare_plugin(example)
1098-
{
1099-
MYSQL_STORAGE_ENGINE_PLUGIN,
1100-
&example_storage_engine,
1101-
"EXAMPLE",
1102-
"Brian Aker, MySQL AB",
1103-
"Example storage engine",
1104-
PLUGIN_LICENSE_GPL,
1105-
example_init_func, /* Plugin Init */
1106-
NULL, /* Plugin Deinit */
1107-
0x0001 /* 0.1 */,
1108-
func_status, /* status variables */
1109-
example_system_variables, /* system variables */
1110-
NULL, /* config options */
1111-
0, /* flags */
1112-
}
1113-
mysql_declare_plugin_end;
11141097
maria_declare_plugin(example)
11151098
{
11161099
MYSQL_STORAGE_ENGINE_PLUGIN,

‎storage/federated/ha_federated.cc

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3390,23 +3390,6 @@ int ha_federated::execute_simple_query(const char *query, int len)
33903390
struct st_mysql_storage_engine federated_storage_engine=
33913391
{ MYSQL_HANDLERTON_INTERFACE_VERSION };
33923392

3393-
mysql_declare_plugin(federated)
3394-
{
3395-
MYSQL_STORAGE_ENGINE_PLUGIN,
3396-
&federated_storage_engine,
3397-
"FEDERATED",
3398-
"Patrick Galbraith and Brian Aker, MySQL AB",
3399-
"Federated MySQL storage engine",
3400-
PLUGIN_LICENSE_GPL,
3401-
federated_db_init, /* Plugin Init */
3402-
federated_done, /* Plugin Deinit */
3403-
0x0100 /* 1.0 */,
3404-
NULL, /* status variables */
3405-
NULL, /* system variables */
3406-
NULL, /* config options */
3407-
0, /* flags */
3408-
}
3409-
mysql_declare_plugin_end;
34103393
maria_declare_plugin(federated)
34113394
{
34123395
MYSQL_STORAGE_ENGINE_PLUGIN,

‎storage/heap/ha_heap.cc

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -839,23 +839,6 @@ int ha_heap::find_unique_row(uchar *record, uint unique_idx)
839839
struct st_mysql_storage_engine heap_storage_engine=
840840
{ MYSQL_HANDLERTON_INTERFACE_VERSION };
841841

842-
mysql_declare_plugin(heap)
843-
{
844-
MYSQL_STORAGE_ENGINE_PLUGIN,
845-
&heap_storage_engine,
846-
"MEMORY",
847-
"MySQL AB",
848-
"Hash based, stored in memory, useful for temporary tables",
849-
PLUGIN_LICENSE_GPL,
850-
heap_init,
851-
NULL,
852-
0x0100, /* 1.0 */
853-
NULL, /* status variables */
854-
NULL, /* system variables */
855-
NULL, /* config options */
856-
0, /* flags */
857-
}
858-
mysql_declare_plugin_end;
859842
maria_declare_plugin(heap)
860843
{
861844
MYSQL_STORAGE_ENGINE_PLUGIN,

‎storage/myisam/ha_myisam.cc

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2648,23 +2648,6 @@ bool ha_myisam::rowid_filter_push(Rowid_filter* rowid_filter)
26482648
struct st_mysql_storage_engine myisam_storage_engine=
26492649
{ MYSQL_HANDLERTON_INTERFACE_VERSION };
26502650

2651-
mysql_declare_plugin(myisam)
2652-
{
2653-
MYSQL_STORAGE_ENGINE_PLUGIN,
2654-
&myisam_storage_engine,
2655-
"MyISAM",
2656-
"MySQL AB",
2657-
"MyISAM storage engine",
2658-
PLUGIN_LICENSE_GPL,
2659-
myisam_init, /* Plugin Init */
2660-
NULL, /* Plugin Deinit */
2661-
0x0100, /* 1.0 */
2662-
NULL, /* status variables */
2663-
myisam_sysvars, /* system variables */
2664-
NULL,
2665-
0,
2666-
}
2667-
mysql_declare_plugin_end;
26682651
maria_declare_plugin(myisam)
26692652
{
26702653
MYSQL_STORAGE_ENGINE_PLUGIN,

‎storage/perfschema/ha_perfschema.cc

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -219,24 +219,6 @@ struct st_mysql_storage_engine pfs_storage_engine=
219219

220220
const char* pfs_engine_name= "PERFORMANCE_SCHEMA";
221221

222-
mysql_declare_plugin(perfschema)
223-
{
224-
MYSQL_STORAGE_ENGINE_PLUGIN,
225-
&pfs_storage_engine,
226-
pfs_engine_name,
227-
"Marc Alff, Oracle", /* Formerly Sun Microsystems, formerly MySQL */
228-
"Performance Schema",
229-
PLUGIN_LICENSE_GPL,
230-
pfs_init_func, /* Plugin Init */
231-
pfs_done_func, /* Plugin Deinit */
232-
0x0001 /* 0.1 */,
233-
pfs_status_vars, /* status variables */
234-
NULL, /* system variables */
235-
NULL, /* config options */
236-
0, /* flags */
237-
}
238-
mysql_declare_plugin_end;
239-
240222
maria_declare_plugin(perfschema)
241223
{
242224
MYSQL_STORAGE_ENGINE_PLUGIN,

0 commit comments

Comments
 (0)