diff options
Diffstat (limited to 'sql/sql_acl.cc')
| -rw-r--r-- | sql/sql_acl.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index 43aa68773bc..c980c435c79 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -300,7 +300,7 @@ public: bool eq(const char *user2, const char *host2) { return !cmp(user2, host2); } - bool wild_eq(const char *user2, const char *host2, const char *ip2 = 0) + bool wild_eq(const char *user2, const char *host2, const char *ip2) { if (strcmp(safe_str(user.str), safe_str(user2))) return false; @@ -1883,7 +1883,7 @@ int acl_check_setrole(THD *thd, char *rolename, ulonglong *access) acl_user= (ACL_USER *)acl_user_base; /* Yes! priv_user@host. Don't ask why - that's what check_access() does. */ if (acl_user->wild_eq(thd->security_ctx->priv_user, - thd->security_ctx->host)) + thd->security_ctx->host, thd->security_ctx->ip)) { is_granted= TRUE; break; @@ -12479,7 +12479,7 @@ maria_declare_plugin(mysql_password) NULL, /* status variables */ NULL, /* system variables */ "1.0", /* String version */ - MariaDB_PLUGIN_MATURITY_BETA /* Maturity */ + MariaDB_PLUGIN_MATURITY_STABLE /* Maturity */ }, { MYSQL_AUTHENTICATION_PLUGIN, /* type constant */ @@ -12494,7 +12494,7 @@ maria_declare_plugin(mysql_password) NULL, /* status variables */ NULL, /* system variables */ "1.0", /* String version */ - MariaDB_PLUGIN_MATURITY_BETA /* Maturity */ + MariaDB_PLUGIN_MATURITY_STABLE /* Maturity */ } maria_declare_plugin_end; |