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

Cleaned up code and changed function structure.

Browse Source
This commit is contained in:
Markus Makela
2015-08-27 16:33:10 +03:00
parent 296bdc5df6
commit c5214bea1b
4 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
server/core/monitor.c
View File

@ -493,7 +493,7 @@ bool check_monitor_permissions(MONITOR* monitor)
server->port);
mysql_close(mysql);
free(dpasswd);
return true;
return false;
}
if(mysql_query(mysql,"show slave status") != 0)
@ -502,13 +502,13 @@ bool check_monitor_permissions(MONITOR* monitor)
{
skygw_log_write(LE,"%s: Error: User '%s' is missing REPLICATION CLIENT privileges. MySQL error message: %s",
monitor->name,user,mysql_error(mysql));
rval = false;
}
else
{
skygw_log_write(LE,"%s: Error: Monitor failed to query for slave status. MySQL error message: %s",
monitor->name,mysql_error(mysql));
}
rval = false;
}
else
{
@ -516,11 +516,12 @@ bool check_monitor_permissions(MONITOR* monitor)
{
skygw_log_write(LE,"%s: Error: Result retrieval failed when checking for REPLICATION CLIENT permissions: %s",
monitor->name,mysql_error(mysql));
free(dpasswd);
mysql_close(mysql);
return rval;
rval = false;
}
else
{
mysql_free_result(res);
}
mysql_free_result(res);
}
mysql_close(mysql);
free(dpasswd);