tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

account for adjusted interface of mysql8 (now utilizes c99 bools instead of my_bool labelled chars)

This commit is contained in:
Elias Ohm 2019-04-29 00:18:15 +02:00
parent 02db12ae02
commit 615f019c2e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/mysql_shim/mysqlinterface.cpp
View File

@ -92,7 +92,7 @@ struct MysqlInterfaceImpl final : public MysqlInterface
return mysql_real_escape_string(mysql, to, from, length); return mysql_real_escape_string(mysql, to, from, length);
} }
my_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);
} }

2
lib/mysql_shim/mysqlinterface.hpp
View File

@ -35,7 +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 my_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;