Merge commit 'e180c200555576cc1f9bfc77342abba422934e4a' into 2.4

2020-03-02 12:51:57 +02:00
parent 9ca2c7f777 e180c20055
commit 4e5d9099ed
3 changed files with 9 additions and 11 deletions
--- a/server/modules/authenticator/MariaDBAuth/dbusers.cc
+++ b/server/modules/authenticator/MariaDBAuth/dbusers.cc
@ -934,7 +934,7 @@ static bool check_server_permissions(SERVICE* service,
    }

    /** Copy the server charset */
-    server->charset = mxs_mysql_get_character_set(mysql);
+    mxs_update_server_charset(mysql, server);

    if (server->version().total == 0)
    {