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

MXS-2220 Use std::string for protocol and authenticator fields

Browse Source
This commit is contained in:
Esa Korhonen
2018-12-19 18:43:55 +02:00
parent 40485d746c
commit ca9c52944b
12 changed files with 44 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/modules/routing/hintrouter/hintrouter.cc
View File

@ -198,7 +198,7 @@ Dcb HintRouter::connect_to_backend(MXS_SESSION* session,
{
Dcb result(NULL);
HR_DEBUG("Connecting to %s.", sref->server->name());
DCB* new_connection = dcb_connect(sref->server, session, sref->server->protocol);
DCB* new_connection = dcb_connect(sref->server, session, sref->server->protocol().c_str());
if (new_connection)
{

4
server/modules/routing/readconnroute/readconnroute.cc
View File

@ -412,9 +412,7 @@ static MXS_ROUTER_SESSION* newSession(MXS_ROUTER* instance, MXS_SESSION* session
client_rses->backend = candidate;
/** Open the backend connection */
client_rses->backend_dcb = dcb_connect(candidate->server,
session,
candidate->server->protocol);
client_rses->backend_dcb = dcb_connect(candidate->server, session, candidate->server->protocol().c_str());
if (client_rses->backend_dcb == NULL)
{