Changeset 42713

Timestamp:

Aug 3, 2024, 1:01:10 PM (2 years ago)

Author:

eugene

Message:

do not include mysql_com.h (not needed explicitly even in Gentoo; causes a warning in Manjaro); use my_bool for mariadb, not mysql > 8.0.1; fix buffer size error

Location:

branches/eam_branches/ipp-20230313/psLib

Files:

• src/db/psDB.c (modified) (2 diffs)
• test/imageops/convolutionBench.c (modified) (1 diff)

branches/eam_branches/ipp-20230313/psLib/src/db/psDB.c

@@ -44 +44 @@
 #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 +54 @@
 #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
 

branches/eam_branches/ipp-20230313/psLib/test/imageops/convolutionBench.c

@@ -56 +56 @@
     }
 
-    char size[16];
+    char size[32];
     sprintf(size, "%dx%d", imageCols, imageRows);
     printf("%15s", size);