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

Cleanup SERVER struct

Browse Source 
Removed one unused field. Rearranged others, clarified comments.
This commit is contained in:
Esa Korhonen
2018-04-26 15:29:41 +03:00
parent ba4700a983
commit 5d010ff712
41 changed files with 301 additions and 297 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/core/mysql_utils.cc
View File

@ -191,7 +191,7 @@ MYSQL *mxs_mysql_real_connect(MYSQL *con, SERVER *server, const char *user, cons
}
}
MYSQL* mysql = mysql_real_connect(con, server->name, user, passwd, NULL, server->port, NULL, 0);
MYSQL* mysql = mysql_real_connect(con, server->address, user, passwd, NULL, server->port, NULL, 0);
if (mysql)
{
@ -202,12 +202,12 @@ MYSQL *mxs_mysql_real_connect(MYSQL *con, SERVER *server, const char *user, cons
if (listener && mysql_get_ssl_cipher(con) == NULL)
{
if (server->log_warning.ssl_not_enabled)
if (server->warn_ssl_not_enabled)
{
server->log_warning.ssl_not_enabled = false;
server->warn_ssl_not_enabled = false;
MXS_ERROR("An encrypted connection to '%s' could not be created, "
"ensure that TLS is enabled on the target server.",
server->unique_name);
server->name);
}
// Don't close the connection as it is closed elsewhere, just set to NULL
mysql = NULL;