Merge branch '2.0' into develop-2.0-merge

2016-11-15 00:09:24 +02:00
parent 2202ec7a33 7ddb4d8e5a
commit 3c15b58891
26 changed files with 621 additions and 239 deletions
--- a/server/core/mysql_utils.c
+++ b/server/core/mysql_utils.c
@ -163,8 +163,6 @@ MYSQL *mxs_mysql_real_connect(MYSQL *con, SERVER *server, const char *user, cons

    if (listener)
    {
-        GATEWAY_CONF* config = config_get_global_options();
-        // mysql_ssl_set always returns true.
        mysql_ssl_set(con, listener->ssl_key, listener->ssl_cert, listener->ssl_ca_cert, NULL, NULL);
    }