From 54e24fcbd537827e32ec029ab6b8af640fd08819 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Sun, 16 Apr 2017 07:05:19 -0400 Subject: [PATCH] Compile user_variables plugin statically Recompile it for embedded. Test it for embedded. Promote it to Gamma --- debian/mariadb-server-10.2.install | 1 - plugin/user_variables/CMakeLists.txt | 3 ++- plugin/user_variables/mysql-test/user_variables/basic.result | 2 +- plugin/user_variables/mysql-test/user_variables/suite.pm | 3 ++- plugin/user_variables/user_variables.cc | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/debian/mariadb-server-10.2.install b/debian/mariadb-server-10.2.install index 7ab6ccd7c7a..3b5a475f486 100644 --- a/debian/mariadb-server-10.2.install +++ b/debian/mariadb-server-10.2.install @@ -56,7 +56,6 @@ usr/lib/mysql/plugin/semisync_slave.so usr/lib/mysql/plugin/server_audit.so usr/lib/mysql/plugin/simple_password_check.so usr/lib/mysql/plugin/sql_errlog.so -usr/lib/mysql/plugin/user_variables.so usr/lib/mysql/plugin/wsrep_info.so usr/share/apport/package-hooks/source_mariadb-10.2.py usr/share/doc/mariadb-server-10.2/mysqld.sym.gz 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;