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

Merge branch '2.3' into 2.4

Browse Source
This commit is contained in:
Markus Mäkelä 2020-01-24 13:06:42 +02:00
commit 25045c41a2
No known key found for this signature in database
GPG Key ID: 72D48FCE664F7B19
3 changed files with 37 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/maxscale/mysql_utils.hh
View File

@ -114,6 +114,13 @@ mxs_mysql_name_kind_t mxs_mysql_name_to_pcre(char* pcre,
*/
void mxs_mysql_update_server_version(SERVER* dest, MYSQL* source);
/**
* Get default server character set
*
* @return The numeric identifier of `@@global.character_set_server`
*/
uint8_t mxs_mysql_get_character_set(MYSQL* mysql);
namespace maxscale
{

32
server/core/mysql_utils.cc
View File

@ -84,9 +84,7 @@ MYSQL* mxs_mysql_real_connect(MYSQL* con, SERVER* server, const char* user, cons
if (mysql)
{
/** 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 (have_ssl && mysql_get_ssl_cipher(con) == NULL)
{
@ -383,3 +381,31 @@ const char* dbg_decode_response(GWBUF* pPacket)
return rv.c_str();
}
#endif
uint8_t mxs_mysql_get_character_set(MYSQL* mysql)
{
uint8_t charset = 8; // Default is latin1 with the ID 8
const char* CHARSET_QUERY =
"SELECT co.id FROM information_schema.collations AS co "
"JOIN information_schema.character_sets AS cs "
"ON (co.collation_name = cs.default_collate_name) "
"WHERE cs.character_set_name=@@global.character_set_server;";
if (mysql_query(mysql, CHARSET_QUERY) == 0)
{
if (auto res = mysql_use_result(mysql))
{
if (auto row = mysql_fetch_row(res))
{
if (row[0])
{
charset = atoi(row[0]);
}
}
mysql_free_result(res);
}
}
return charset;
}

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

@ -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)
{