diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-04-16 07:05:19 -0400 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-04-30 14:58:11 +0200 |
| commit | 54e24fcbd537827e32ec029ab6b8af640fd08819 (patch) | |
| tree | 1dd0ca4bf3cff02fd1b833e5682a333e55c6de2d /plugin/user_variables | |
| parent | 0072d2e9a162e87c50988d9f820ae40fdfdf7251 (diff) | |
| download | mariadb-git-54e24fcbd537827e32ec029ab6b8af640fd08819.tar.gz | |
Compile user_variables plugin statically
Recompile it for embedded.
Test it for embedded.
Promote it to Gamma
Diffstat (limited to 'plugin/user_variables')
4 files changed, 6 insertions, 4 deletions
diff --git a/plugin/user_variables/CMakeLists.txt b/plugin/user_variables/CMakeLists.txt index b9ec7d18ba1..6638a5cb622 100644 --- a/plugin/user_variables/CMakeLists.txt +++ b/plugin/user_variables/CMakeLists.txt @@ -1 +1,2 @@ -MYSQL_ADD_PLUGIN(user_variables user_variables.cc) +MYSQL_ADD_PLUGIN(user_variables user_variables.cc + DEFAULT RECOMPILE_FOR_EMBEDDED) diff --git a/plugin/user_variables/mysql-test/user_variables/basic.result b/plugin/user_variables/mysql-test/user_variables/basic.result index 02de31b5e09..5650fa0dcce 100644 --- a/plugin/user_variables/mysql-test/user_variables/basic.result +++ b/plugin/user_variables/mysql-test/user_variables/basic.result @@ -7,7 +7,7 @@ PLUGIN_AUTHOR Sergey Vojtovich PLUGIN_DESCRIPTION User-defined variables PLUGIN_LICENSE GPL LOAD_OPTION ON -PLUGIN_MATURITY Alpha +PLUGIN_MATURITY Gamma SHOW CREATE TABLE INFORMATION_SCHEMA.USER_VARIABLES; Table Create Table user_variables CREATE TEMPORARY TABLE `user_variables` ( diff --git a/plugin/user_variables/mysql-test/user_variables/suite.pm b/plugin/user_variables/mysql-test/user_variables/suite.pm index ae757eedee4..b927bf40ecc 100644 --- a/plugin/user_variables/mysql-test/user_variables/suite.pm +++ b/plugin/user_variables/mysql-test/user_variables/suite.pm @@ -6,7 +6,8 @@ return "No USER_VARIABLES plugin" unless $ENV{USER_VARIABLES_SO} or $::mysqld_variables{'user-variables'} eq "ON"; -return "Not run for embedded server" if $::opt_embedded_server; +return "Not run for embedded server" if $::opt_embedded_server and + $ENV{USER_VARIABLES_SO}; sub is_default { 1 } diff --git a/plugin/user_variables/user_variables.cc b/plugin/user_variables/user_variables.cc index 981c39cdb86..9190b2effb7 100644 --- a/plugin/user_variables/user_variables.cc +++ b/plugin/user_variables/user_variables.cc @@ -134,6 +134,6 @@ maria_declare_plugin(user_variables) NULL, NULL, "1.0", - MariaDB_PLUGIN_MATURITY_ALPHA + MariaDB_PLUGIN_MATURITY_GAMMA } maria_declare_plugin_end; |