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

Fix to MXS-227: https://mariadb.atlassian.net/browse/MXS-227

Browse Source 
Fixed memory leak.
This commit is contained in:
Markus Makela
2015-06-29 19:17:12 +03:00
parent 2c3c856ea1
commit 6f343ff57b
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -280,7 +280,7 @@ monitorDatabase(MONITOR *mon, MONITOR_SERVERS *database)
{ {
GALERA_MONITOR* handle = (GALERA_MONITOR*)mon->handle; GALERA_MONITOR* handle = (GALERA_MONITOR*)mon->handle;
MYSQL_ROW row; MYSQL_ROW row;
MYSQL_RES *result; MYSQL_RES *result,*result2;
int isjoined = 0; int isjoined = 0;
char *uname = mon->user; char *uname = mon->user;
char *passwd = mon->password; char *passwd = mon->password;
@ -388,11 +388,12 @@ char *server_string;
/* Check if the node is a donor and is using xtrabackup, in this case it can stay alive */ /* Check if the node is a donor and is using xtrabackup, in this case it can stay alive */
else if (strcmp(row[1], "2") == 0 && handle->availableWhenDonor == 1) { else if (strcmp(row[1], "2") == 0 && handle->availableWhenDonor == 1) {
if (mysql_query(database->con, "SHOW VARIABLES LIKE 'wsrep_sst_method'") == 0 if (mysql_query(database->con, "SHOW VARIABLES LIKE 'wsrep_sst_method'") == 0
&& (result = mysql_store_result(database->con)) != NULL) && (result2 = mysql_store_result(database->con)) != NULL)
{ {
if(mysql_field_count(database->con) < 2) if(mysql_field_count(database->con) < 2)
{ {
mysql_free_result(result); mysql_free_result(result);
mysql_free_result(result2);
skygw_log_write(LE,"Error: Unexpected result for \"SHOW VARIABLES LIKE 'wsrep_sst_method'\". Expected 2 columns." skygw_log_write(LE,"Error: Unexpected result for \"SHOW VARIABLES LIKE 'wsrep_sst_method'\". Expected 2 columns."
" MySQL Version: %s",version_str); " MySQL Version: %s",version_str);
return; return;
@ -402,6 +403,7 @@ char *server_string;
if (strncmp(row[1], "xtrabackup", 10) == 0) if (strncmp(row[1], "xtrabackup", 10) == 0)
isjoined = 1; isjoined = 1;
} }
mysql_free_result(result2);
} }
} }
} }