mirror of
https://git.icinga.com/packaging/rpm-icinga2.git
synced 2025-09-11 20:28:08 +02:00
38 lines
2.0 KiB
Diff
38 lines
2.0 KiB
Diff
From 615f019c2e2da9e66c4c0c484d0f916c876d7bdc Mon Sep 17 00:00:00 2001
|
|
From: Elias Ohm <eohm@novomind.com>
|
|
Date: Mon, 29 Apr 2019 00:18:15 +0200
|
|
Subject: [PATCH] account for adjusted interface of mysql8 (now utilizes c99
|
|
bools instead of my_bool labelled chars)
|
|
|
|
---
|
|
lib/mysql_shim/mysqlinterface.cpp | 2 +-
|
|
lib/mysql_shim/mysqlinterface.hpp | 2 +-
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/lib/mysql_shim/mysqlinterface.cpp b/lib/mysql_shim/mysqlinterface.cpp
|
|
index 5807639e2d..aadefda476 100644
|
|
--- a/lib/mysql_shim/mysqlinterface.cpp
|
|
+++ b/lib/mysql_shim/mysqlinterface.cpp
|
|
@@ -92,7 +92,7 @@ struct MysqlInterfaceImpl final : public MysqlInterface
|
|
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);
|
|
}
|
|
diff --git a/lib/mysql_shim/mysqlinterface.hpp b/lib/mysql_shim/mysqlinterface.hpp
|
|
index 2aac49d24c..1ac63868c1 100644
|
|
--- a/lib/mysql_shim/mysqlinterface.hpp
|
|
+++ b/lib/mysql_shim/mysqlinterface.hpp
|
|
@@ -35,7 +35,7 @@ struct MysqlInterface
|
|
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;
|
|
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 unsigned int thread_safe() const = 0;
|
|
|