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

Merge branch '2.2' into develop

Browse Source
This commit is contained in:
Marko
2018-06-07 14:39:16 +03:00
parent 2481de260f 0dd7448586
commit 880db1353a
4 changed files with 76 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/core/server.cc
View File

@ -191,6 +191,7 @@ server_free(SERVER *tofreeserver)
/* Clean up session and free the memory */
MXS_FREE(tofreeserver->protocol);
MXS_FREE(tofreeserver->name);
MXS_FREE(tofreeserver->authenticator);
server_parameter_free(tofreeserver->parameters);
if (tofreeserver->persistent)
@ -201,6 +202,7 @@ server_free(SERVER *tofreeserver)
{
dcb_persistent_clean_count(tofreeserver->persistent[i], i, true);
}
MXS_FREE(tofreeserver->persistent);
}
delete tofreeserver->disk_space_threshold;
MXS_FREE(tofreeserver);

2
server/core/test/test_server.cc
View File

@ -131,6 +131,8 @@ bool test_load_config(const char *input, SERVER *server)
"Server authenticators differ");
TEST(server->port == atoi(config_get_param(param, "port")->value), "Server ports differ");
TEST(create_new_server(obj) == 0, "Failed to create server from loaded config");
duplicate_context_finish(&dcontext);
config_context_free(obj);
}
}