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

MXS-2220 Change server name to constant string

Browse Source
This commit is contained in:
Esa Korhonen
2018-12-19 15:15:02 +02:00
parent 5fc2c1f49c
commit 40485d746c
37 changed files with 194 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/core/mysql_utils.cc
View File

@ -183,7 +183,7 @@ MYSQL* mxs_mysql_real_connect(MYSQL* con, SERVER* server, const char* user, cons
if (!mysql && extra_port > 0)
{
mysql = mysql_real_connect(con, server->address, user, passwd, NULL, extra_port, NULL, 0);
MXS_WARNING("Could not connect with normal port to server '%s', using extra_port", server->name);
MXS_WARNING("Could not connect with normal port to server '%s', using extra_port", server->name());
}
if (mysql)
@ -200,7 +200,7 @@ MYSQL* mxs_mysql_real_connect(MYSQL* con, SERVER* server, const char* user, cons
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->name);
server->name());
}
// Don't close the connection as it is closed elsewhere, just set to NULL
mysql = NULL;