summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--plugin/auth_pam/auth_pam.c2
-rw-r--r--plugin/auth_socket/auth_socket.c2
-rw-r--r--plugin/feedback/feedback.cc2
-rw-r--r--plugin/locale_info/locale_info.cc2
-rw-r--r--plugin/metadata_lock_info/metadata_lock_info.cc2
-rw-r--r--plugin/qc_info/qc_info.cc2
-rw-r--r--plugin/query_response_time/mysql-test/query_response_time/basic.result4
-rw-r--r--plugin/query_response_time/plugin.cc4
-rw-r--r--plugin/sql_errlog/sql_errlog.c2
-rw-r--r--storage/federated/ha_federated.cc2
-rw-r--r--storage/federatedx/ha_federatedx.cc2
-rw-r--r--storage/sequence/sequence.cc2
-rw-r--r--storage/sphinx/ha_sphinx.cc2
-rw-r--r--storage/spider/spd_i_s.cc8
-rw-r--r--storage/spider/spd_param.cc12
-rw-r--r--storage/tokudb/hatoku_hton.cc14
16 files changed, 30 insertions, 34 deletions
diff --git a/plugin/auth_pam/auth_pam.c b/plugin/auth_pam/auth_pam.c
index 2a06b6a01a6..fbca8bf9e93 100644
--- a/plugin/auth_pam/auth_pam.c
+++ b/plugin/auth_pam/auth_pam.c
@@ -189,6 +189,6 @@ maria_declare_plugin(pam)
NULL,
vars,
"1.0",
- MariaDB_PLUGIN_MATURITY_BETA
+ MariaDB_PLUGIN_MATURITY_STABLE
}
maria_declare_plugin_end;
diff --git a/plugin/auth_socket/auth_socket.c b/plugin/auth_socket/auth_socket.c
index 78d7e769f7b..779998395b0 100644
--- a/plugin/auth_socket/auth_socket.c
+++ b/plugin/auth_socket/auth_socket.c
@@ -99,7 +99,7 @@ maria_declare_plugin(socket_auth)
NULL,
NULL,
"1.0",
- MariaDB_PLUGIN_MATURITY_BETA
+ MariaDB_PLUGIN_MATURITY_STABLE
}
maria_declare_plugin_end;
diff --git a/plugin/feedback/feedback.cc b/plugin/feedback/feedback.cc
index 9bf2fcb99bc..54459ae6f17 100644
--- a/plugin/feedback/feedback.cc
+++ b/plugin/feedback/feedback.cc
@@ -394,7 +394,7 @@ maria_declare_plugin(feedback)
NULL,
feedback::settings,
"1.1",
- MariaDB_PLUGIN_MATURITY_BETA
+ MariaDB_PLUGIN_MATURITY_STABLE
}
maria_declare_plugin_end;
#endif
diff --git a/plugin/locale_info/locale_info.cc b/plugin/locale_info/locale_info.cc
index f88c9eb9f6b..2d998b5c880 100644
--- a/plugin/locale_info/locale_info.cc
+++ b/plugin/locale_info/locale_info.cc
@@ -117,6 +117,6 @@ maria_declare_plugin(locales)
NULL, /* Status variables */
NULL, /* System variables */
"1.0", /* String version representation */
- MariaDB_PLUGIN_MATURITY_ALPHA /* Maturity (see include/mysql/plugin.h)*/
+ MariaDB_PLUGIN_MATURITY_GAMMA /* Maturity (see include/mysql/plugin.h)*/
}
maria_declare_plugin_end;
diff --git a/plugin/metadata_lock_info/metadata_lock_info.cc b/plugin/metadata_lock_info/metadata_lock_info.cc
index f5d892d4a07..2a2d5e58e2b 100644
--- a/plugin/metadata_lock_info/metadata_lock_info.cc
+++ b/plugin/metadata_lock_info/metadata_lock_info.cc
@@ -163,7 +163,7 @@ maria_declare_plugin(metadata_lock_info)
NULL,
NULL,
NULL,
- MariaDB_PLUGIN_MATURITY_ALPHA,
+ MariaDB_PLUGIN_MATURITY_BETA,
}
maria_declare_plugin_end;
#else
diff --git a/plugin/qc_info/qc_info.cc b/plugin/qc_info/qc_info.cc
index 717c54d548b..796fa0fbd9a 100644
--- a/plugin/qc_info/qc_info.cc
+++ b/plugin/qc_info/qc_info.cc
@@ -207,7 +207,7 @@ maria_declare_plugin(query_cache_info)
NULL, /* status variables */
NULL, /* system variables */
"1.0", /* version as a string */
- MariaDB_PLUGIN_MATURITY_ALPHA
+ MariaDB_PLUGIN_MATURITY_GAMMA
}
maria_declare_plugin_end;
diff --git a/plugin/query_response_time/mysql-test/query_response_time/basic.result b/plugin/query_response_time/mysql-test/query_response_time/basic.result
index b8aeb0a8e6e..15746424b1d 100644
--- a/plugin/query_response_time/mysql-test/query_response_time/basic.result
+++ b/plugin/query_response_time/mysql-test/query_response_time/basic.result
@@ -17,11 +17,11 @@ PLUGIN_TYPE INFORMATION SCHEMA
PLUGIN_AUTHOR Percona and Sergey Vojtovich
PLUGIN_DESCRIPTION Query Response Time Distribution INFORMATION_SCHEMA Plugin
PLUGIN_LICENSE GPL
-PLUGIN_MATURITY Alpha
+PLUGIN_MATURITY Gamma
PLUGIN_NAME QUERY_RESPONSE_TIME_AUDIT
PLUGIN_VERSION 1.0
PLUGIN_TYPE AUDIT
PLUGIN_AUTHOR Percona and Sergey Vojtovich
PLUGIN_DESCRIPTION Query Response Time Distribution Audit Plugin
PLUGIN_LICENSE GPL
-PLUGIN_MATURITY Alpha
+PLUGIN_MATURITY Gamma
diff --git a/plugin/query_response_time/plugin.cc b/plugin/query_response_time/plugin.cc
index ce7b8a784ff..4012ad09d2b 100644
--- a/plugin/query_response_time/plugin.cc
+++ b/plugin/query_response_time/plugin.cc
@@ -143,7 +143,7 @@ maria_declare_plugin(query_response_time)
NULL,
query_response_time_info_vars,
"1.0",
- MariaDB_PLUGIN_MATURITY_ALPHA
+ MariaDB_PLUGIN_MATURITY_GAMMA
},
{
MYSQL_AUDIT_PLUGIN,
@@ -158,6 +158,6 @@ maria_declare_plugin(query_response_time)
NULL,
NULL,
"1.0",
- MariaDB_PLUGIN_MATURITY_ALPHA
+ MariaDB_PLUGIN_MATURITY_GAMMA
}
maria_declare_plugin_end;
diff --git a/plugin/sql_errlog/sql_errlog.c b/plugin/sql_errlog/sql_errlog.c
index 5ff1279a2fe..1c7e141c022 100644
--- a/plugin/sql_errlog/sql_errlog.c
+++ b/plugin/sql_errlog/sql_errlog.c
@@ -158,6 +158,6 @@ maria_declare_plugin(sql_errlog)
NULL,
vars,
"1.0",
- MariaDB_PLUGIN_MATURITY_ALPHA
+ MariaDB_PLUGIN_MATURITY_GAMMA
}
maria_declare_plugin_end;
diff --git a/storage/federated/ha_federated.cc b/storage/federated/ha_federated.cc
index e5d6c338388..45e51a022b5 100644
--- a/storage/federated/ha_federated.cc
+++ b/storage/federated/ha_federated.cc
@@ -3466,6 +3466,6 @@ maria_declare_plugin(federated)
NULL, /* status variables */
NULL, /* system variables */
"1.0", /* string version */
- MariaDB_PLUGIN_MATURITY_BETA /* maturity */
+ MariaDB_PLUGIN_MATURITY_GAMMA /* maturity */
}
maria_declare_plugin_end;
diff --git a/storage/federatedx/ha_federatedx.cc b/storage/federatedx/ha_federatedx.cc
index d8b9bcbb075..97cabd5f152 100644
--- a/storage/federatedx/ha_federatedx.cc
+++ b/storage/federatedx/ha_federatedx.cc
@@ -3653,6 +3653,6 @@ maria_declare_plugin(federatedx)
NULL, /* status variables */
NULL, /* system variables */
"2.1", /* string version */
- MariaDB_PLUGIN_MATURITY_BETA /* maturity */
+ MariaDB_PLUGIN_MATURITY_STABLE /* maturity */
}
maria_declare_plugin_end;
diff --git a/storage/sequence/sequence.cc b/storage/sequence/sequence.cc
index 0d92c324724..e1111bb0f7c 100644
--- a/storage/sequence/sequence.cc
+++ b/storage/sequence/sequence.cc
@@ -376,7 +376,7 @@ maria_declare_plugin(sequence)
NULL,
NULL,
"0.1",
- MariaDB_PLUGIN_MATURITY_EXPERIMENTAL
+ MariaDB_PLUGIN_MATURITY_GAMMA
}
maria_declare_plugin_end;
diff --git a/storage/sphinx/ha_sphinx.cc b/storage/sphinx/ha_sphinx.cc
index 080496ce826..f31669e931c 100644
--- a/storage/sphinx/ha_sphinx.cc
+++ b/storage/sphinx/ha_sphinx.cc
@@ -3630,7 +3630,7 @@ maria_declare_plugin(sphinx)
sphinx_status_vars,
NULL,
SPHINXSE_VERSION, // string version
- MariaDB_PLUGIN_MATURITY_EXPERIMENTAL
+ MariaDB_PLUGIN_MATURITY_GAMMA
}
maria_declare_plugin_end;
diff --git a/storage/spider/spd_i_s.cc b/storage/spider/spd_i_s.cc
index c32745dae98..156f7081770 100644
--- a/storage/spider/spd_i_s.cc
+++ b/storage/spider/spd_i_s.cc
@@ -128,7 +128,7 @@ static int spider_i_s_alloc_mem_deinit(
DBUG_RETURN(0);
}
-struct st_mysql_plugin spider_i_s_alloc_mem =
+struct st_maria_plugin spider_i_s_alloc_mem =
{
MYSQL_INFORMATION_SCHEMA_PLUGIN,
&spider_i_s_info,
@@ -141,8 +141,6 @@ struct st_mysql_plugin spider_i_s_alloc_mem =
0x0001,
NULL,
NULL,
- NULL,
-#if MYSQL_VERSION_ID >= 50600
- 0,
-#endif
+ "0.1",
+ MariaDB_PLUGIN_MATURITY_BETA
};
diff --git a/storage/spider/spd_param.cc b/storage/spider/spd_param.cc
index b610c2a2111..c3ccd4076fc 100644
--- a/storage/spider/spd_param.cc
+++ b/storage/spider/spd_param.cc
@@ -32,7 +32,7 @@
#include "spd_table.h"
#include "spd_trx.h"
-extern struct st_mysql_plugin spider_i_s_alloc_mem;
+extern struct st_maria_plugin spider_i_s_alloc_mem;
extern volatile ulonglong spider_mon_table_cache_version;
extern volatile ulonglong spider_mon_table_cache_version_req;
@@ -2957,7 +2957,7 @@ static struct st_mysql_sys_var* spider_system_variables[] = {
NULL
};
-mysql_declare_plugin(spider)
+maria_declare_plugin(spider)
{
MYSQL_STORAGE_ENGINE_PLUGIN,
&spider_storage_engine,
@@ -2970,10 +2970,8 @@ mysql_declare_plugin(spider)
0x0300,
spider_status_variables,
spider_system_variables,
- NULL,
-#if MYSQL_VERSION_ID >= 50600
- 0,
-#endif
+ "3.0",
+ MariaDB_PLUGIN_MATURITY_BETA
},
spider_i_s_alloc_mem
-mysql_declare_plugin_end;
+maria_declare_plugin_end;
diff --git a/storage/tokudb/hatoku_hton.cc b/storage/tokudb/hatoku_hton.cc
index 911b274a302..68b13e1c4ad 100644
--- a/storage/tokudb/hatoku_hton.cc
+++ b/storage/tokudb/hatoku_hton.cc
@@ -2369,7 +2369,7 @@ maria_declare_plugin(tokudb)
toku_global_status_variables_export, /* status variables */
tokudb_system_variables, /* system variables */
TOKUDB_PLUGIN_VERSION_STR, /* string version */
- MariaDB_PLUGIN_MATURITY_ALPHA /* maturity */
+ MariaDB_PLUGIN_MATURITY_GAMMA /* maturity */
},
{
MYSQL_INFORMATION_SCHEMA_PLUGIN,
@@ -2384,7 +2384,7 @@ maria_declare_plugin(tokudb)
NULL, /* status variables */
NULL, /* system variables */
TOKUDB_PLUGIN_VERSION_STR, /* string version */
- MariaDB_PLUGIN_MATURITY_ALPHA /* maturity */
+ MariaDB_PLUGIN_MATURITY_GAMMA /* maturity */
},
{
MYSQL_INFORMATION_SCHEMA_PLUGIN,
@@ -2399,7 +2399,7 @@ maria_declare_plugin(tokudb)
NULL, /* status variables */
NULL, /* system variables */
TOKUDB_PLUGIN_VERSION_STR, /* string version */
- MariaDB_PLUGIN_MATURITY_ALPHA /* maturity */
+ MariaDB_PLUGIN_MATURITY_GAMMA /* maturity */
},
{
MYSQL_INFORMATION_SCHEMA_PLUGIN,
@@ -2414,7 +2414,7 @@ maria_declare_plugin(tokudb)
NULL, /* status variables */
NULL, /* system variables */
TOKUDB_PLUGIN_VERSION_STR, /* string version */
- MariaDB_PLUGIN_MATURITY_ALPHA /* maturity */
+ MariaDB_PLUGIN_MATURITY_GAMMA /* maturity */
},
{
MYSQL_INFORMATION_SCHEMA_PLUGIN,
@@ -2429,7 +2429,7 @@ maria_declare_plugin(tokudb)
NULL, /* status variables */
NULL, /* system variables */
TOKUDB_PLUGIN_VERSION_STR, /* string version */
- MariaDB_PLUGIN_MATURITY_ALPHA /* maturity */
+ MariaDB_PLUGIN_MATURITY_GAMMA /* maturity */
},
{
MYSQL_INFORMATION_SCHEMA_PLUGIN,
@@ -2444,7 +2444,7 @@ maria_declare_plugin(tokudb)
NULL, /* status variables */
NULL, /* system variables */
TOKUDB_PLUGIN_VERSION_STR, /* string version */
- MariaDB_PLUGIN_MATURITY_ALPHA /* maturity */
+ MariaDB_PLUGIN_MATURITY_GAMMA /* maturity */
},
{
MYSQL_INFORMATION_SCHEMA_PLUGIN,
@@ -2459,7 +2459,7 @@ maria_declare_plugin(tokudb)
NULL, /* status variables */
NULL, /* system variables */
TOKUDB_PLUGIN_VERSION_STR, /* string version */
- MariaDB_PLUGIN_MATURITY_ALPHA /* maturity */
+ MariaDB_PLUGIN_MATURITY_GAMMA /* maturity */
}
maria_declare_plugin_end;
View Lorry Controller Status