account for adjusted interface of mysql8 (now utilizes c99 bools instead of my_bool...

diff --git a/lib/mysql_shim/mysqlinterface.cpp b/lib/mysql_shim/mysqlinterface.cpp
index 5807639e2d5ec68e1c39c0e88759d797bc0697d0..aadefda476f234761e34d8760c22f1d923b9c97f 100644 (file)
--- 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 2aac49d24cf411eca85cfb00052caba3a9cc0458..1ac63868c1da82915071efd900ee188438c12b44 100644 (file)
--- 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;