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

Merge branch 'develop' of github.com:skysql/MaxScale into develop

Browse Source
This commit is contained in:
Mark Riddoch
2014-06-06 09:01:06 +01:00
parent 4f560889f8 047dd5f90e
commit c7b3c0925d
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
server/core/config.c
View File

@ -1152,7 +1152,8 @@ SERVER *server;
} }
} }
else if (strcmp(type, "server") != 0 && else if (strcmp(type, "server") != 0 &&
strcmp(type, "monitor") != 0) strcmp(type, "monitor") != 0 &&
strcmp(type, "filter") != 0)
{ {
LOGIF(LE, (skygw_log_write_flush( LOGIF(LE, (skygw_log_write_flush(
LOGFILE_ERROR, LOGFILE_ERROR,

3
server/core/service.c
View File

@ -542,10 +542,13 @@ serviceClearRouterOptions(SERVICE *service)
int i; int i;
spinlock_acquire(&service->spin); spinlock_acquire(&service->spin);
if (service->routerOptions != NULL)
{
for (i = 0; service->routerOptions[i]; i++) for (i = 0; service->routerOptions[i]; i++)
free(service->routerOptions[i]); free(service->routerOptions[i]);
free(service->routerOptions); free(service->routerOptions);
service->routerOptions = NULL; service->routerOptions = NULL;
}
spinlock_release(&service->spin); spinlock_release(&service->spin);
} }
/** /**