Index: /branches/eam_branches/ipp-20230313/psLib/src/db/psDB.c
===================================================================
--- /branches/eam_branches/ipp-20230313/psLib/src/db/psDB.c	(revision 42712)
+++ /branches/eam_branches/ipp-20230313/psLib/src/db/psDB.c	(revision 42713)
@@ -44,6 +44,5 @@
 #include <regex.h>
 #include <mysql.h>
-#include <mysql_com.h> // enum_field_types
-
+// #include <mysql_com.h> // enum_field_types
 #include "psDB.h"
 #include "psMemory.h"
@@ -55,9 +54,9 @@
 #include "psMetadataConfig.h"
 
-
-# if (MYSQL_VERSION_ID >= 80000)
-    # define MYSQL_BOOL bool
+/* my_bool was removed from mysql at version 8.0.1, but not from mariadb */
+# if (MYSQL_VERSION_ID >= 80100) && !defined MARIADB_VERSION_ID 
+  # define MYSQL_BOOL bool
 # else
-    # define MYSQL_BOOL my_bool
+  # define MYSQL_BOOL my_bool
 # endif
 
Index: /branches/eam_branches/ipp-20230313/psLib/test/imageops/convolutionBench.c
===================================================================
--- /branches/eam_branches/ipp-20230313/psLib/test/imageops/convolutionBench.c	(revision 42712)
+++ /branches/eam_branches/ipp-20230313/psLib/test/imageops/convolutionBench.c	(revision 42713)
@@ -56,5 +56,5 @@
     }
 
-    char size[16];
+    char size[32];
     sprintf(size, "%dx%d", imageCols, imageRows);
     printf("%15s", size);