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

Merge branch 'develop' into MXS-121

Browse Source 
Conflicts:
	server/modules/monitor/mysql_mon.c
This commit is contained in:
Markus Makela
2015-05-09 04:49:06 +03:00
parent 5a3ed0de9b 593f88489a
commit 49d5409dcb
16 changed files with 165 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/modules/monitor/galeramon.c
View File

@ -282,6 +282,8 @@ char *server_string;
int read_timeout = mon->read_timeout;
int write_timeout = mon->write_timeout;
if(database->con)
mysql_close(database->con);
database->con = mysql_init(NULL);
mysql_options(database->con, MYSQL_OPT_CONNECT_TIMEOUT, (void *)&connect_timeout);

3
server/modules/monitor/mm_mon.c
View File

@ -252,7 +252,8 @@ char *server_string;
{
char *dpwd = decryptPassword(passwd);
int read_timeout = 1;
if(database->con)
mysql_close(database->con);
database->con = mysql_init(NULL);
mysql_options(database->con, MYSQL_OPT_READ_TIMEOUT, (void *)&read_timeout);

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

@ -1254,3 +1254,4 @@ monitor_clear_pending_status(MONITOR_SERVERS *ptr, int bit)
{
ptr->pending_status &= ~bit;
}
y

2
server/modules/monitor/ndbcluster_mon.c
View File

@ -233,6 +233,8 @@ char *server_string;
int read_timeout = mon->read_timeout;
int write_timeout = mon->write_timeout;
if(database->con)
mysql_close(database->con);
database->con = mysql_init(NULL);
rc = mysql_options(database->con, MYSQL_OPT_CONNECT_TIMEOUT, (void *)&connect_timeout);