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

Disabled C99.

Browse Source
This commit is contained in:
Markus Makela
2015-07-14 12:14:01 +03:00
parent 40f4d8ee8f
commit 96edaca90c
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/macros.cmake
View File

@ -21,7 +21,7 @@ endmacro()
macro(set_variables) macro(set_variables)
# Use C99 # Use C99
set(USE_C99 TRUE CACHE BOOL "Use C99 standard") set(USE_C99 FALSE CACHE BOOL "Use C99 standard")
# Install the template maxscale.cnf file # Install the template maxscale.cnf file
set(WITH_MAXSCALE_CNF TRUE CACHE BOOL "Install the template maxscale.cnf file") set(WITH_MAXSCALE_CNF TRUE CACHE BOOL "Install the template maxscale.cnf file")

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

@ -525,7 +525,7 @@ static MONITOR_SERVERS *build_mysql51_replication_tree(MONITOR *mon)
{ {
MONITOR_SERVERS* database = mon->databases; MONITOR_SERVERS* database = mon->databases;
MONITOR_SERVERS *ptr,*rval = NULL; MONITOR_SERVERS *ptr,*rval = NULL;
int i;
while(database) while(database)
{ {
bool ismaster = false; bool ismaster = false;
@ -587,7 +587,7 @@ static MONITOR_SERVERS *build_mysql51_replication_tree(MONITOR *mon)
while(ptr) while(ptr)
{ {
for(int i = 0;ptr->server->slaves[i];i++) for(i = 0;ptr->server->slaves[i];i++)
{ {
if(ptr->server->slaves[i] == database->server->node_id) if(ptr->server->slaves[i] == database->server->node_id)
{ {