Commit 54e24fcb authored by Sergei Golubchik's avatar Sergei Golubchik

Compile user_variables plugin statically

Recompile it for embedded.
Test it for embedded.
Promote it to Gamma
parent 0072d2e9
...@@ -56,7 +56,6 @@ usr/lib/mysql/plugin/semisync_slave.so ...@@ -56,7 +56,6 @@ usr/lib/mysql/plugin/semisync_slave.so
usr/lib/mysql/plugin/server_audit.so usr/lib/mysql/plugin/server_audit.so
usr/lib/mysql/plugin/simple_password_check.so usr/lib/mysql/plugin/simple_password_check.so
usr/lib/mysql/plugin/sql_errlog.so usr/lib/mysql/plugin/sql_errlog.so
usr/lib/mysql/plugin/user_variables.so
usr/lib/mysql/plugin/wsrep_info.so usr/lib/mysql/plugin/wsrep_info.so
usr/share/apport/package-hooks/source_mariadb-10.2.py usr/share/apport/package-hooks/source_mariadb-10.2.py
usr/share/doc/mariadb-server-10.2/mysqld.sym.gz usr/share/doc/mariadb-server-10.2/mysqld.sym.gz
......
MYSQL_ADD_PLUGIN(user_variables user_variables.cc) MYSQL_ADD_PLUGIN(user_variables user_variables.cc
DEFAULT RECOMPILE_FOR_EMBEDDED)
...@@ -7,7 +7,7 @@ PLUGIN_AUTHOR Sergey Vojtovich ...@@ -7,7 +7,7 @@ PLUGIN_AUTHOR Sergey Vojtovich
PLUGIN_DESCRIPTION User-defined variables PLUGIN_DESCRIPTION User-defined variables
PLUGIN_LICENSE GPL PLUGIN_LICENSE GPL
LOAD_OPTION ON LOAD_OPTION ON
PLUGIN_MATURITY Alpha PLUGIN_MATURITY Gamma
SHOW CREATE TABLE INFORMATION_SCHEMA.USER_VARIABLES; SHOW CREATE TABLE INFORMATION_SCHEMA.USER_VARIABLES;
Table Create Table Table Create Table
user_variables CREATE TEMPORARY TABLE `user_variables` ( user_variables CREATE TEMPORARY TABLE `user_variables` (
......
...@@ -6,7 +6,8 @@ return "No USER_VARIABLES plugin" unless ...@@ -6,7 +6,8 @@ return "No USER_VARIABLES plugin" unless
$ENV{USER_VARIABLES_SO} or $ENV{USER_VARIABLES_SO} or
$::mysqld_variables{'user-variables'} eq "ON"; $::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 } sub is_default { 1 }
......
...@@ -134,6 +134,6 @@ maria_declare_plugin(user_variables) ...@@ -134,6 +134,6 @@ maria_declare_plugin(user_variables)
NULL, NULL,
NULL, NULL,
"1.0", "1.0",
MariaDB_PLUGIN_MATURITY_ALPHA MariaDB_PLUGIN_MATURITY_GAMMA
} }
maria_declare_plugin_end; maria_declare_plugin_end;
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment