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

Merge branch 'develop' of https://github.com/mariadb-corporation/MaxScale into develop

Browse Source
This commit is contained in:
Markus Makela
2015-07-20 09:00:53 +03:00
parent aa6294f1f2 edd2688e71
commit cefd775717
4 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/modules/monitor/mysql_mon.c
View File

@ -310,7 +310,7 @@ static inline bool connect_to_db(MONITOR* mon,MONITOR_SERVERS *database)
mysql_options(database->con, MYSQL_OPT_READ_TIMEOUT, (void *)&read_timeout);
mysql_options(database->con, MYSQL_OPT_WRITE_TIMEOUT, (void *)&write_timeout);
return (mysql_real_connect(database->con,
bool result = (mysql_real_connect(database->con,
database->server->name,
uname,
dpwd,
@ -318,6 +318,8 @@ static inline bool connect_to_db(MONITOR* mon,MONITOR_SERVERS *database)
database->server->port,
NULL,
0) != NULL);
free(dpwd);
return result;
}
static inline void monitor_mysql100_db(MONITOR_SERVERS* database)

4
server/modules/protocol/mysql_client.c
View File

@ -1115,7 +1115,9 @@ int gw_read_client_event(
* send redundant COM_QUIT.
*/
/* Temporarily suppressed: SESSION_ROUTE_QUERY(session, read_buffer); */
/**
/* Replaced with freeing the read buffer. */
gwbuf_free(read_buffer);
/**
* Close router session which causes closing of backends.
*/
dcb_close(dcb);