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

Merge branch '2.1' into develop

Browse Source
This commit is contained in:
Johan Wikman
2017-02-14 17:54:27 +02:00
parent 5f0346f5a9 3a3b31ebb4
commit 0838401b32
46 changed files with 321 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/core/service.c
View File

@ -142,7 +142,7 @@ SERVICE* service_alloc(const char *name, const char *router)
return NULL;
}
service->capabilities = service->router->getCapabilities();
service->capabilities = 0;
service->client_count = 0;
service->n_dbref = 0;
service->name = my_name;
@ -485,6 +485,8 @@ int serviceInitialize(SERVICE *service)
if ((service->router_instance = service->router->createInstance(service, router_options)))
{
service->capabilities |= service->router->getCapabilities(service->router_instance);
if (!config_get_global_options()->config_check)
{
listeners = serviceStartAllPorts(service);
@ -1237,7 +1239,7 @@ serviceSetFilters(SERVICE *service, char *filters)
{
if (filter_load(flist[n - 1]))
{
capabilities |= flist[n - 1]->obj->getCapabilities();
capabilities |= flist[n - 1]->obj->getCapabilities(flist[n - 1]->filter);
}
else
{