2018-05-14: version 1.1.141 (horchi)\n added: Compatibility for newer MariaBD librarys (patch by provided by marco)\n added: execution shell to scripts\n\n1.1.141

2 files changed, 9 insertions, 1 deletions

diff --git a/lib/db.c b/lib/db.c
index 2dbca80..7c3b57c 100644
--- a/lib/db.c
+++ b/lib/db.c
@@ -1376,11 +1376,19 @@ int cDbConnection::errorSql(cDbConnection* connection, const char* prefix,
 
    if (error == CR_SERVER_LOST ||
        error == CR_SERVER_GONE_ERROR ||
+// for compatibility with newer versions of MariaBD library
+#ifdef CR_INVALID_CONN_HANDLE
        error == CR_INVALID_CONN_HANDLE ||
+#endif
        error == CR_COMMANDS_OUT_OF_SYNC ||
        error == CR_SERVER_LOST_EXTENDED ||
        error == CR_STMT_CLOSED ||
+// for compatibility with newer versions of MariaBD library
+#ifdef CR_CONN_UNKNOW_PROTOCOL
        error == CR_CONN_UNKNOW_PROTOCOL ||
+#else
+       error == CR_CONN_UNKNOWN_PROTOCOL ||
+#endif
        error == CR_UNSUPPORTED_PARAM_TYPE ||
        error == CR_NO_PREPARE_STMT ||
        error == CR_SERVER_HANDSHAKE_ERR ||
diff --git a/lib/db.h b/lib/db.h
index efb5ebf..6d22810 100644
--- a/lib/db.h
+++ b/lib/db.h
@@ -1296,7 +1296,7 @@ class cDbProcedure : public cDbService
       int created()
       {
          if (!connection || !connection->getMySql())
-            return fail;
+            return no;
 
          cDbStatement stmt(connection);