Merge branch '2.3' into 2.4

2020-01-24 13:06:42 +02:00
parent 17916969b6 a0affe1bb7
commit 25045c41a2
3 changed files with 37 additions and 6 deletions
--- a/server/modules/authenticator/MariaDBAuth/dbusers.cc
+++ b/server/modules/authenticator/MariaDBAuth/dbusers.cc
@ -934,9 +934,7 @@ static bool check_server_permissions(SERVICE* service,
    }

    /** Copy the server charset */
-    MY_CHARSET_INFO cs_info;
-    mysql_get_character_set_info(mysql, &cs_info);
-    server->charset = cs_info.number;
+    server->charset = mxs_mysql_get_character_set(mysql);

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