Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
MXS-684: Service permission checks use correct column names
The MySQL 5.7 `authentication_string` column caused all permission checks
to fail for services.
  • Loading branch information
markus456 committed Apr 25, 2016
1 parent 53fecde commit 7f18c57
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion server/core/dbusers.c
Expand Up @@ -2673,7 +2673,13 @@ bool check_service_permissions(SERVICE* service)
return my_errno != ER_ACCESS_DENIED_ERROR;
}

if (mysql_query(mysql, "SELECT user, host, password,Select_priv FROM mysql.user limit 1") != 0)
char query[MAX_QUERY_STR_LEN];
const char* query_pw = strstr(server->server->server_string, "5.7.") ?
MYSQL57_PASSWORD : MYSQL_PASSWORD;

snprintf(query, sizeof(query), "SELECT user, host, %s, Select_priv FROM mysql.user limit 1", query_pw);

if (mysql_query(mysql, query) != 0)
{
if (mysql_errno(mysql) == ER_TABLEACCESS_DENIED_ERROR)
{
Expand Down

0 comments on commit 7f18c57

Please sign in to comment.