hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit 'e180c200555576cc1f9bfc77342abba422934e4a' into 2.4

Browse Source
This commit is contained in:
Markus Mäkelä
2020-03-02 12:51:57 +02:00
parent 9ca2c7f777 e180c20055
commit 4e5d9099ed
3 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/maxscale/mysql_utils.hh
View File

@ -115,11 +115,12 @@ mxs_mysql_name_kind_t mxs_mysql_name_to_pcre(char* pcre,
void mxs_mysql_update_server_version(SERVER* dest, MYSQL* source); void mxs_mysql_update_server_version(SERVER* dest, MYSQL* source);
/** /**
* Get default server character set * Update default server character set from @@global.character_set_server
* *
* @return The numeric identifier of `@@global.character_set_server` * @param mysql The connection handle
* @param server The server to modify
*/ */
uint8_t mxs_mysql_get_character_set(MYSQL* mysql); void mxs_update_server_charset(MYSQL* mysql, SERVER* server);
namespace maxscale namespace maxscale
{ {

11
server/core/mysql_utils.cc
View File

@ -87,7 +87,7 @@ MYSQL* mxs_mysql_real_connect(MYSQL* con, SERVER* server, const char* user, cons
if (mysql) if (mysql)
{ {
/** Copy the server charset */ /** Copy the server charset */
server->charset = mxs_mysql_get_character_set(mysql); mxs_update_server_charset(mysql, server);
if (ssl && mysql_get_ssl_cipher(con) == NULL) if (ssl && mysql_get_ssl_cipher(con) == NULL)
{ {
@ -385,16 +385,15 @@ const char* dbg_decode_response(GWBUF* pPacket)
} }
#endif #endif
uint8_t mxs_mysql_get_character_set(MYSQL* mysql) void mxs_update_server_charset(MYSQL* mysql, SERVER* server)
{ {
uint8_t charset = 8; // Default is latin1 with the ID 8
const char* CHARSET_QUERY = const char* CHARSET_QUERY =
"SELECT co.id FROM information_schema.collations AS co " "SELECT co.id FROM information_schema.collations AS co "
"JOIN information_schema.character_sets AS cs " "JOIN information_schema.character_sets AS cs "
"ON (co.collation_name = cs.default_collate_name) " "ON (co.collation_name = cs.default_collate_name) "
"WHERE cs.character_set_name=@@global.character_set_server;"; "WHERE cs.character_set_name=@@global.character_set_server;";
if (mysql_query(mysql, CHARSET_QUERY) == 0) if (mxs_mysql_query(mysql, CHARSET_QUERY) == 0)
{ {
if (auto res = mysql_use_result(mysql)) if (auto res = mysql_use_result(mysql))
{ {
@ -402,13 +401,11 @@ uint8_t mxs_mysql_get_character_set(MYSQL* mysql)
{ {
if (row[0]) if (row[0])
{ {
charset = atoi(row[0]); server->charset = atoi(row[0]);
} }
} }
mysql_free_result(res); mysql_free_result(res);
} }
} }
return charset;
} }

2
server/modules/authenticator/MariaDBAuth/dbusers.cc
View File

@ -934,7 +934,7 @@ static bool check_server_permissions(SERVICE* service,
} }
/** Copy the server charset */ /** Copy the server charset */
server->charset = mxs_mysql_get_character_set(mysql); mxs_update_server_charset(mysql, server);
if (server->version().total == 0) if (server->version().total == 0)
{ {