diff options
| author | Aleksey Midenkov <midenok@gmail.com> | 2017-12-11 15:43:41 +0300 |
|---|---|---|
| committer | Aleksey Midenkov <midenok@gmail.com> | 2017-12-11 15:43:41 +0300 |
| commit | 79dd77e6aebc861b82e4895941224bbbad441650 (patch) | |
| tree | 8c22b54de7964a89358415b5380c2bc734f162a1 /plugin | |
| parent | b7cd18289639b30fafc7f623c1187e442608727c (diff) | |
| parent | 8f581e8bf1d400be08995b1cf8c11e3b0f7ae283 (diff) | |
| download | mariadb-git-79dd77e6aebc861b82e4895941224bbbad441650.tar.gz | |
System Versioning 1.0 pre3
Merge branch '10.3' into trunk
Diffstat (limited to 'plugin')
| -rw-r--r-- | plugin/simple_password_check/simple_password_check.c | 5 | ||||
| -rw-r--r-- | plugin/wsrep_info/mysql-test/wsrep_info/suite.pm | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/plugin/simple_password_check/simple_password_check.c b/plugin/simple_password_check/simple_password_check.c index dd4051e8169..445ed621e74 100644 --- a/plugin/simple_password_check/simple_password_check.c +++ b/plugin/simple_password_check/simple_password_check.c @@ -15,6 +15,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include <mysqld_error.h> +#include <my_attribute.h> #include <mysql/plugin_password_validation.h> #include <ctype.h> #include <string.h> @@ -50,7 +51,9 @@ static int validate(MYSQL_CONST_LEX_STRING *username, others < min_others; } -static void fix_min_length(MYSQL_THD thd, struct st_mysql_sys_var *var, +static void fix_min_length(MYSQL_THD thd __attribute__((unused)), + struct st_mysql_sys_var *var + __attribute__((unused)), void *var_ptr, const void *save) { unsigned int new_min_length; diff --git a/plugin/wsrep_info/mysql-test/wsrep_info/suite.pm b/plugin/wsrep_info/mysql-test/wsrep_info/suite.pm index 9f684ae6b0c..9268cb3e06b 100644 --- a/plugin/wsrep_info/mysql-test/wsrep_info/suite.pm +++ b/plugin/wsrep_info/mysql-test/wsrep_info/suite.pm @@ -9,8 +9,10 @@ return "Not run for embedded server" if $::opt_embedded_server; return "WSREP is not compiled in" unless defined $::mysqld_variables{'wsrep-on'}; my ($provider) = grep { -f $_ } $ENV{WSREP_PROVIDER}, - "/usr/lib/galera/libgalera_smm.so", - "/usr/lib64/galera/libgalera_smm.so"; + "/usr/lib64/galera-3/libgalera_smm.so", + "/usr/lib64/galera/libgalera_smm.so", + "/usr/lib/galera-3/libgalera_smm.so", + "/usr/lib/galera/libgalera_smm.so"; return "No wsrep provider library" unless -f $provider; |