put status variables in the proper pluginname_ scope

(but support the scopeless mysql style too).
always output status/system variables in the correct lettercase

5 files changed, 4 insertions, 76 deletions

diff --git a/plugin/audit_null/audit_null.c b/plugin/audit_null/audit_null.c
index be0c70fbd35..0616f192f20 100644
--- a/plugin/audit_null/audit_null.c
+++ b/plugin/audit_null/audit_null.c
@@ -127,12 +127,10 @@ static struct st_mysql_audit audit_null_descriptor=
 
 static struct st_mysql_show_var simple_status[]=
 {
-  { "Audit_null_called", (char *) &number_of_calls, SHOW_INT },
-  { "Audit_null_general_log", (char *) &number_of_calls_general_log, SHOW_INT },
-  { "Audit_null_general_error", (char *) &number_of_calls_general_error,
-    SHOW_INT },
-  { "Audit_null_general_result", (char *) &number_of_calls_general_result,
-    SHOW_INT },
+  { "called", (char *) &number_of_calls, SHOW_INT },
+  { "general_log", (char *) &number_of_calls_general_log, SHOW_INT },
+  { "general_error", (char *) &number_of_calls_general_error, SHOW_INT },
+  { "general_result", (char *) &number_of_calls_general_result, SHOW_INT },
   { 0, 0, 0}
 };
 
diff --git a/plugin/auth_socket/auth_socket.c b/plugin/auth_socket/auth_socket.c
index 41cb1039fd2..78d7e769f7b 100644
--- a/plugin/auth_socket/auth_socket.c
+++ b/plugin/auth_socket/auth_socket.c
@@ -85,23 +85,6 @@ static struct st_mysql_auth socket_auth_handler=
   socket_auth
 };
 
-mysql_declare_plugin(socket_auth)
-{
-  MYSQL_AUTHENTICATION_PLUGIN,
-  &socket_auth_handler,
-  "unix_socket",
-  "Sergei Golubchik",
-  "Unix Socket based authentication",
-  PLUGIN_LICENSE_GPL,
-  NULL,
-  NULL,
-  0x0100,
-  NULL,
-  NULL,
-  NULL,
-  0,
-}
-mysql_declare_plugin_end;
 maria_declare_plugin(socket_auth)
 {
   MYSQL_AUTHENTICATION_PLUGIN,
diff --git a/plugin/daemon_example/daemon_example.cc b/plugin/daemon_example/daemon_example.cc
index ec2979de3c3..7d047b2eaf7 100644
--- a/plugin/daemon_example/daemon_example.cc
+++ b/plugin/daemon_example/daemon_example.cc
@@ -188,23 +188,6 @@ struct st_mysql_daemon daemon_example_plugin=
   Plugin library descriptor
 */
 
-mysql_declare_plugin(daemon_example)
-{
-  MYSQL_DAEMON_PLUGIN,
-  &daemon_example_plugin,
-  "daemon_example",
-  "Brian Aker",
-  "Daemon example, creates a heartbeat beat file in mysql-heartbeat.log",
-  PLUGIN_LICENSE_GPL,
-  daemon_example_plugin_init, /* Plugin Init */
-  daemon_example_plugin_deinit, /* Plugin Deinit */
-  0x0100 /* 1.0 */,
-  NULL,                       /* status variables                */
-  NULL,                       /* system variables                */
-  NULL,                       /* config options                  */
-  0,                          /* flags                           */
-}
-mysql_declare_plugin_end;
 maria_declare_plugin(daemon_example)
 {
   MYSQL_DAEMON_PLUGIN,
diff --git a/plugin/fulltext/plugin_example.c b/plugin/fulltext/plugin_example.c
index 981335bddd6..2af3555393c 100644
--- a/plugin/fulltext/plugin_example.c
+++ b/plugin/fulltext/plugin_example.c
@@ -254,24 +254,6 @@ static struct st_mysql_sys_var* simple_system_variables[]= {
   Plugin library descriptor
 */
 
-mysql_declare_plugin(ftexample)
-{
-  MYSQL_FTPARSER_PLUGIN,      /* type                            */
-  &simple_parser_descriptor,  /* descriptor                      */
-  "simple_parser",            /* name                            */
-  "Sergei Golubchik",         /* author                          */
-  "Simple Full-Text Parser",  /* description                     */
-  PLUGIN_LICENSE_GPL,
-  simple_parser_plugin_init,  /* init function (when loaded)     */
-  simple_parser_plugin_deinit,/* deinit function (when unloaded) */
-  0x0001,                     /* version                         */
-  simple_status,              /* status variables                */
-  simple_system_variables,    /* system variables                */
-  NULL,
-  0,
-}
-mysql_declare_plugin_end;
-
 maria_declare_plugin(ftexample)
 {
   MYSQL_FTPARSER_PLUGIN,      /* type                            */
diff --git a/plugin/sql_errlog/sql_errlog.c b/plugin/sql_errlog/sql_errlog.c
index ce383916621..f84af963aca 100644
--- a/plugin/sql_errlog/sql_errlog.c
+++ b/plugin/sql_errlog/sql_errlog.c
@@ -144,24 +144,6 @@ static struct st_mysql_audit descriptor =
   { MYSQL_AUDIT_GENERAL_CLASSMASK }
 };
 
-mysql_declare_plugin(sql_errlog)
-{
-  MYSQL_AUDIT_PLUGIN,
-  &descriptor,
-  "SQL_ERROR_LOG",
-  "Alexey Botchkov",
-  "Log SQL level errors to a file with rotation",
-  PLUGIN_LICENSE_GPL,
-  sql_error_log_init,
-  sql_error_log_deinit,
-  0x0100,
-  NULL,
-  vars,
-  NULL,
-  0
-}
-mysql_declare_plugin_end;
-
 maria_declare_plugin(sql_errlog)
 {
   MYSQL_AUDIT_PLUGIN,