diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2014-12-23 18:36:33 -0500 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2014-12-23 18:36:33 -0500 |
| commit | 03e0f1f86617c54722cc23f4f5c101d60adfa485 (patch) | |
| tree | f64d3548c055a9ca0c4cab9c721659ec4d3b4a47 /plugin/wsrep_info | |
| parent | 0b87de124d716cee7c1aa56f30c7f80c2c2bfcce (diff) | |
| download | mariadb-git-03e0f1f86617c54722cc23f4f5c101d60adfa485.tar.gz | |
MDEV-7053 : WSREP_STATUS & WSREP_MEMBERSHIP I_S tables
Addendum : Renamed plugin .so file.
Diffstat (limited to 'plugin/wsrep_info')
| -rw-r--r-- | plugin/wsrep_info/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | plugin/wsrep_info/mysql-test/wsrep_info/suite.opt | 2 | ||||
| -rw-r--r-- | plugin/wsrep_info/mysql-test/wsrep_info/suite.pm | 4 | ||||
| -rw-r--r-- | plugin/wsrep_info/plugin.cc | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/plugin/wsrep_info/CMakeLists.txt b/plugin/wsrep_info/CMakeLists.txt index b70981d2f7b..4dee10c34c1 100644 --- a/plugin/wsrep_info/CMakeLists.txt +++ b/plugin/wsrep_info/CMakeLists.txt @@ -1,5 +1,5 @@ IF (WITH_WSREP) INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/sql ${CMAKE_SOURCE_DIR}/wsrep) - MYSQL_ADD_PLUGIN(WSREP_STATUS plugin.cc MODULE_ONLY) + MYSQL_ADD_PLUGIN(WSREP_INFO plugin.cc MODULE_ONLY) ENDIF() diff --git a/plugin/wsrep_info/mysql-test/wsrep_info/suite.opt b/plugin/wsrep_info/mysql-test/wsrep_info/suite.opt index c806c2e7633..b17344f88d0 100644 --- a/plugin/wsrep_info/mysql-test/wsrep_info/suite.opt +++ b/plugin/wsrep_info/mysql-test/wsrep_info/suite.opt @@ -1 +1 @@ ---plugin-load-add=$WSREP_STATUS_SO +--plugin-load-add=$WSREP_INFO_SO diff --git a/plugin/wsrep_info/mysql-test/wsrep_info/suite.pm b/plugin/wsrep_info/mysql-test/wsrep_info/suite.pm index 5af1daa673c..5fd761896a1 100644 --- a/plugin/wsrep_info/mysql-test/wsrep_info/suite.pm +++ b/plugin/wsrep_info/mysql-test/wsrep_info/suite.pm @@ -1,4 +1,4 @@ -package My::Suite::WSREP_STATUS; +package My::Suite::WSREP_INFO; use File::Basename; use My::Find; @@ -14,7 +14,7 @@ my ($provider) = grep { -f $_ } $ENV{WSREP_PROVIDER}, return "No wsrep provider library" unless -f $provider; -return "No WSREP_STATUS plugin" unless $ENV{WSREP_STATUS_SO}; +return "No WSREP_INFO plugin" unless $ENV{WSREP_INFO_SO}; $ENV{WSREP_PROVIDER} = $provider; diff --git a/plugin/wsrep_info/plugin.cc b/plugin/wsrep_info/plugin.cc index 15469ae39dd..f3de177c85f 100644 --- a/plugin/wsrep_info/plugin.cc +++ b/plugin/wsrep_info/plugin.cc @@ -231,7 +231,7 @@ static struct st_mysql_information_schema wsrep_status_plugin= Plugin library descriptor */ -maria_declare_plugin(wsrep_status) +maria_declare_plugin(wsrep_info) { MYSQL_INFORMATION_SCHEMA_PLUGIN, &wsrep_memb_plugin, |