hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '2.3' into 2.4

Browse Source
This commit is contained in:
Markus Mäkelä
2019-07-18 12:49:00 +03:00
parent 52fd2f011f 84f4688ebb
commit 2e70e2bc93
5 changed files with 55 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
server/modules/authenticator/MariaDBAuth/mysql_auth.cc
View File

@ -774,7 +774,8 @@ static int mysql_auth_load_users(Listener* port)
first_load = true;
}
int loaded = replace_mysql_users(port, first_load);
SERVER* srv = nullptr;
int loaded = replace_mysql_users(port, first_load, &srv);
bool injected = false;
if (loaded <= 0)
@ -821,7 +822,9 @@ static int mysql_auth_load_users(Listener* port)
}
else if (loaded > 0 && first_load)
{
MXS_NOTICE("[%s] Loaded %d MySQL users for listener %s.", service->name(), loaded, port->name());
mxb_assert(srv);
MXS_NOTICE("[%s] Loaded %d MySQL users for listener %s from server %s.",
service->name(), loaded, port->name(), srv->name());
}
return rc;