tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-27 15:44:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDO MySQL: explicitly use latin1

Browse Source 
for the case the MySQL client lib is compiled with another default
not to turn Unicode chars into ??.
This commit is contained in:
Alexander A. Klimov 2022-03-31 13:52:59 +02:00
parent 338d0aaa8c
commit 245fbad1e5
3 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/db_ido_mysql/idomysqlconnection.cpp
View File

@ -262,6 +262,8 @@ void IdoMysqlConnection::Reconnect()
BOOST_THROW_EXCEPTION(std::bad_alloc()); BOOST_THROW_EXCEPTION(std::bad_alloc());
} }
m_Mysql->options(&m_Connection, MYSQL_SET_CHARSET_NAME, "latin1");
if (enableSsl) if (enableSsl)
m_Mysql->ssl_set(&m_Connection, sslKey, sslCert, sslCa, sslCaPath, sslCipher); m_Mysql->ssl_set(&m_Connection, sslKey, sslCert, sslCa, sslCaPath, sslCipher);

5
lib/mysql_shim/mysqlinterface.cpp
View File

@ -92,6 +92,11 @@ struct MysqlInterfaceImpl final : public MysqlInterface
return mysql_real_escape_string(mysql, to, from, length); return mysql_real_escape_string(mysql, to, from, length);
} }
int options(MYSQL *mysql, mysql_option option, const void *arg) const override
{
return mysql_options(mysql, option, arg);
}
bool ssl_set(MYSQL *mysql, const char *key, const char *cert, const char *ca, const char *capath, const char *cipher) const override bool ssl_set(MYSQL *mysql, const char *key, const char *cert, const char *ca, const char *capath, const char *cipher) const override
{ {
return mysql_ssl_set(mysql, key, cert, ca, capath, cipher); return mysql_ssl_set(mysql, key, cert, ca, capath, cipher);

1
lib/mysql_shim/mysqlinterface.hpp
View File

@ -35,6 +35,7 @@ struct MysqlInterface
virtual MYSQL *real_connect(MYSQL *mysql, const char *host, const char *user, const char *passwd, virtual MYSQL *real_connect(MYSQL *mysql, const char *host, const char *user, const char *passwd,
const char *db, unsigned int port, const char *unix_socket, unsigned long clientflag) const = 0; const char *db, unsigned int port, const char *unix_socket, unsigned long clientflag) const = 0;
virtual unsigned long real_escape_string(MYSQL *mysql, char *to, const char *from, unsigned long length) const = 0; virtual unsigned long real_escape_string(MYSQL *mysql, char *to, const char *from, unsigned long length) const = 0;
virtual int options(MYSQL *mysql, mysql_option option, const void *arg) const = 0;
virtual bool ssl_set(MYSQL *mysql, const char *key, const char *cert, const char *ca, const char *capath, const char *cipher) const = 0; virtual bool ssl_set(MYSQL *mysql, const char *key, const char *cert, const char *ca, const char *capath, const char *cipher) const = 0;
virtual MYSQL_RES *store_result(MYSQL *mysql) const = 0; virtual MYSQL_RES *store_result(MYSQL *mysql) const = 0;
virtual unsigned int thread_safe() const = 0; virtual unsigned int thread_safe() const = 0;