Merge branch '2.0' into develop

2016-09-12 09:39:26 +03:00
parent 0d157b16f8 8be833640f
commit 0b4320fb1d
7 changed files with 33 additions and 26 deletions
--- a/server/core/server.c
+++ b/server/core/server.c
@ -143,7 +143,6 @@ server_free(SERVER *tofreeserver)
    MXS_FREE(tofreeserver->protocol);
    MXS_FREE(tofreeserver->unique_name);
    MXS_FREE(tofreeserver->server_string);
-    MXS_FREE(tofreeserver->slaves);
    server_parameter_free(tofreeserver->parameters);

    if (tofreeserver->persistent)