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

Merge branch 'release-1.2' into develop

Browse Source
This commit is contained in:
Markus Makela
2015-07-15 11:38:27 +03:00
parent 78eab19c62 124ad82de4
commit b756690123
6 changed files with 477 additions and 262 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
server/core/config.c
View File

@ -2053,6 +2053,7 @@ static char *monitor_params[] =
"passwd",
"script",
"events",
"mysql51_replication",
"monitor_interval",
"detect_replication_lag",
"detect_stale_master",

22
server/core/service.c
View File

@ -279,10 +279,13 @@ GWPROTOCOL *funcs;
if(mkdir_rval)
{
skygw_log_write(LOGFILE_ERROR,"Error : Failed to create directory '%s': [%d] %s",
path,
errno,
strerror(errno));
if(errno != EEXIST)
{
skygw_log_write(LOGFILE_ERROR,"Error : Failed to create directory '%s': [%d] %s",
path,
errno,
strerror(errno));
}
mkdir_rval = 0;
}
@ -294,10 +297,13 @@ GWPROTOCOL *funcs;
if(mkdir_rval)
{
skygw_log_write(LOGFILE_ERROR,"Error : Failed to create directory '%s': [%d] %s",
path,
errno,
strerror(errno));
if(errno != EEXIST)
{
skygw_log_write(LOGFILE_ERROR,"Error : Failed to create directory '%s': [%d] %s",
path,
errno,
strerror(errno));
}
mkdir_rval = 0;
}
strncat(path, "/dbusers", PATH_MAX);