rename plugins to remove "_plugin" from the plugin name

This commit is contained in:
Sergei Golubchik 2015-03-27 15:58:02 +01:00
commit 88632726e8
21 changed files with 32 additions and 32 deletions

View file

@ -0,0 +1,2 @@
MYSQL_ADD_PLUGIN(DEBUG_KEY_MANAGEMENT debug_key_management_plugin.cc
MODULE_ONLY)

View file

@ -73,11 +73,11 @@ struct st_mariadb_encryption_key_management debug_key_management_plugin= {
/*
Plugin library descriptor
*/
maria_declare_plugin(debug_key_management_plugin)
maria_declare_plugin(debug_key_management)
{
MariaDB_ENCRYPTION_KEY_MANAGEMENT_PLUGIN,
&debug_key_management_plugin,
"debug_key_management_plugin",
"debug_key_management",
"Sergei Golubchik",
"Debug key management plugin",
PLUGIN_LICENSE_GPL,

View file

@ -1,2 +0,0 @@
MYSQL_ADD_PLUGIN(DEBUG_KEY_MANAGEMENT_PLUGIN debug_key_management_plugin.cc
MODULE_ONLY)

View file

@ -0,0 +1,2 @@
MYSQL_ADD_PLUGIN(EXAMPLE_KEY_MANAGEMENT example_key_management_plugin.cc
MODULE_ONLY)

View file

@ -123,11 +123,11 @@ struct st_mariadb_encryption_key_management example_key_management_plugin= {
/*
Plugin library descriptor
*/
maria_declare_plugin(example_key_management_plugin)
maria_declare_plugin(example_key_management)
{
MariaDB_ENCRYPTION_KEY_MANAGEMENT_PLUGIN,
&example_key_management_plugin,
"example_key_management_plugin",
"example_key_management",
"Jonas Oreland",
"Example key management plugin",
PLUGIN_LICENSE_GPL,

View file

@ -1,2 +0,0 @@
MYSQL_ADD_PLUGIN(EXAMPLE_KEY_MANAGEMENT_PLUGIN example_key_management_plugin.cc
MODULE_ONLY)

View file

@ -1,6 +1,6 @@
SET(FILE_KEY_MANAGEMENT_PLUGIN_SOURCES file_key_management_plugin.cc EncKeys.cc KeySingleton.cc)
IF(NOT SSL_SOURCES)
MYSQL_ADD_PLUGIN(FILE_KEY_MANAGEMENT_PLUGIN ${FILE_KEY_MANAGEMENT_PLUGIN_SOURCES}
MYSQL_ADD_PLUGIN(FILE_KEY_MANAGEMENT ${FILE_KEY_MANAGEMENT_PLUGIN_SOURCES}
LINK_LIBRARIES pcre)
ENDIF()

View file

@ -211,13 +211,13 @@ static int file_key_management_plugin_init(void *p)
if (current_aes_dynamic_method == MY_AES_ALGORITHM_NONE)
{
sql_print_error("No encryption method choosen with --encryption-algorithm. "
"file_key_management_plugin disabled");
"file_key_management disabled");
return 1;
}
if (filename == NULL || strcmp("", filename) == 0)
{
sql_print_error("Parameter file_key_management_plugin_filename is required");
sql_print_error("Parameter file_key_management_filename is required");
return 1;
}
@ -245,13 +245,13 @@ struct st_mariadb_encryption_key_management file_key_management_plugin= {
/*
Plugin library descriptor
*/
maria_declare_plugin(file_key_management_plugin)
maria_declare_plugin(file_key_management)
{
MariaDB_ENCRYPTION_KEY_MANAGEMENT_PLUGIN,
&file_key_management_plugin,
"file_key_management_plugin",
"file_key_management",
"Denis Endro eperi GmbH",
"File key management plugin",
"File-based key management plugin",
PLUGIN_LICENSE_GPL,
file_key_management_plugin_init, /* Plugin Init */
file_key_management_plugin_deinit, /* Plugin Deinit */