diff options
| author | Jan Lindström <jan.lindstrom@skysql.com> | 2015-02-18 15:23:37 +0200 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@skysql.com> | 2015-02-18 15:23:37 +0200 |
| commit | 36c1982a19723e45c00cb0b5eea16d2e4c069c21 (patch) | |
| tree | 262988ff5eb9f4c595e8fb8f5ae58e1be6f3740b | |
| parent | 4040bf18cfe7c200bc85b5f3afdab498245fcb32 (diff) | |
| download | mariadb-git-36c1982a19723e45c00cb0b5eea16d2e4c069c21.tar.gz | |
MDEV-7604: wsrep plugin lists its plugin_maturity as Unknown
Changed wsrep plugin from mysql_plugin to maria_plugin to
set up plugin_maturity to Stable.
| -rw-r--r-- | mysql-test/suite/wsrep/r/plugin.result | 3 | ||||
| -rw-r--r-- | mysql-test/suite/wsrep/t/plugin.test | 7 | ||||
| -rw-r--r-- | sql/wsrep_hton.cc | 8 |
3 files changed, 14 insertions, 4 deletions
diff --git a/mysql-test/suite/wsrep/r/plugin.result b/mysql-test/suite/wsrep/r/plugin.result new file mode 100644 index 00000000000..4f52173cb25 --- /dev/null +++ b/mysql-test/suite/wsrep/r/plugin.result @@ -0,0 +1,3 @@ +SELECT plugin_name,plugin_version,plugin_maturity FROM information_schema.plugins where plugin_name like 'wsrep' ORDER BY plugin_maturity,plugin_name; +plugin_name plugin_version plugin_maturity +wsrep 1.0 Stable diff --git a/mysql-test/suite/wsrep/t/plugin.test b/mysql-test/suite/wsrep/t/plugin.test new file mode 100644 index 00000000000..60738440a55 --- /dev/null +++ b/mysql-test/suite/wsrep/t/plugin.test @@ -0,0 +1,7 @@ +--source include/have_wsrep.inc + +# +# MDEV-7604: wsrep plugin lists its status as Unknown +# + +SELECT plugin_name,plugin_version,plugin_maturity FROM information_schema.plugins where plugin_name like 'wsrep' ORDER BY plugin_maturity,plugin_name;
\ No newline at end of file diff --git a/sql/wsrep_hton.cc b/sql/wsrep_hton.cc index 36be70249ca..8ef51548e79 100644 --- a/sql/wsrep_hton.cc +++ b/sql/wsrep_hton.cc @@ -561,7 +561,7 @@ struct st_mysql_storage_engine wsrep_storage_engine= { MYSQL_HANDLERTON_INTERFACE_VERSION }; -mysql_declare_plugin(wsrep) +maria_declare_plugin(wsrep) { MYSQL_STORAGE_ENGINE_PLUGIN, &wsrep_storage_engine, @@ -575,7 +575,7 @@ mysql_declare_plugin(wsrep) 0x0100 /* 1.0 */, NULL, /* status variables */ NULL, /* system variables */ - NULL, /* config options */ - 0, /* flags */ + "1.0", /* string version */ + MariaDB_PLUGIN_MATURITY_STABLE /* maturity */ } -mysql_declare_plugin_end; +maria_declare_plugin_end; |