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

Merge remote-tracking branch 'origin/develop' into MXS-122

Browse Source 
Conflicts:
	server/core/dcb.c
This commit is contained in:
counterpoint
2015-07-08 14:54:22 +01:00
parent 4cea1b68c0 10d690273d
commit ba417ef633
45 changed files with 1189 additions and 774 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
log_manager/log_manager.cc
View File

@ -1395,7 +1395,7 @@ int skygw_log_write_flush(
/**
* Write log string to buffer and add to file write list.
*/
for(i = LOGFILE_FIRST;i<=LOGFILE_LAST;i <<=1)
for (i = LOGFILE_FIRST; i<LOGFILE_LAST ;i <<=1)
{
/**
* If particular log is disabled in general and it is not enabled for
@ -1458,7 +1458,7 @@ int skygw_log_write(
* Write log string to buffer and add to file write list.
*/
for(i = LOGFILE_FIRST;i<=LOGFILE_LAST;i <<=1)
for (i = LOGFILE_FIRST; i<=LOGFILE_LAST; i <<=1)
{
/**
* If particular log is disabled in general and it is not enabled for