Fixed a memory leak in all the monitors when a failed mysql_ping to the database caused a reinitialization of MYSQL* connection.

2015-05-07 11:42:14 +03:00
parent daf5b80a6f
commit fdd5a10478
4 changed files with 8 additions and 2 deletions
--- a/server/modules/monitor/mysql_mon.c
+++ b/server/modules/monitor/mysql_mon.c
@ -401,7 +401,8 @@ char 		  *server_string;
                int  connect_timeout = handle->connect_timeout;
                int  read_timeout = handle->read_timeout;
                int  write_timeout = handle->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);