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

Merge branch '2.3' into develop

Browse Source
This commit is contained in:
Markus Mäkelä
2019-01-07 10:52:07 +02:00
parent cf9ac9004e 0859f3caff
commit f0f9c21d1c
67 changed files with 777 additions and 469 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
server/modules/authenticator/MySQLAuth/dbusers.cc
View File

@ -214,7 +214,8 @@ static char* get_users_query(const SERVER::Version& version, bool include_root,
switch (category)
{
case SERVER_ROLES:
rval = version.total >= 100202 ? get_mariadb_102_users_query(include_root) :
// Require 10.2.15 due to MDEV-15840 and MDEV-15556
rval = version.total >= 100215 ? get_mariadb_102_users_query(include_root) :
get_mariadb_101_users_query(include_root);
break;

4
server/modules/authenticator/MySQLAuth/mysql_auth.cc
View File

@ -285,9 +285,9 @@ static bool is_localhost_address(struct sockaddr_storage* addr)
*/
static int mysql_auth_authenticate(DCB* dcb)
{
int auth_ret = ssl_authenticate_check_status(dcb);
int auth_ret = MXS_AUTH_SSL_COMPLETE;
MYSQL_session* client_data = (MYSQL_session*)dcb->data;
if (auth_ret == MXS_AUTH_SSL_COMPLETE && *client_data->user)
if (*client_data->user)
{
MXS_DEBUG("Receiving connection from '%s' to database '%s'.",
client_data->user,