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/modules/authenticator/MySQLAuth/dbusers.c
+++ b/server/modules/authenticator/MySQLAuth/dbusers.c
@ -2532,6 +2532,11 @@ static bool check_server_permissions(SERVICE *service, SERVER* server,
        return my_errno != ER_ACCESS_DENIED_ERROR;
    }

+    /** Copy the server charset */
+    MY_CHARSET_INFO cs_info;
+    mysql_get_character_set_info(mysql, &cs_info);
+    server->charset = cs_info.number;
+
    if (server->server_string == NULL)
    {
        const char *server_string = mysql_get_server_info(mysql);