Changeset 42153

Timestamp:

Mar 29, 2022, 3:43:48 PM (4 years ago)

Author:

eugene

Message:

test for MYSQL version to select bool type

File:

• branches/eam_branches/ipp-20220316/psLib/src/db/psDB.c (modified) (4 diffs)

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

@@ -56 +56 @@
 
 
+# if (MYSQL_VERSION_ID > 50735)
+    # define MYSQL_BOOL bool
+# else
+    # define MYSQL_BOOL my_bool
+# endif
+
 // set the pointer to NULL if we are actually freeing the memory
 #define PSDB_NULL_FREE(ptr) \
@@ -138 +144 @@
 
 // pType utility functions
-static psPtr    psDBGetPTypeNaN(psElemType pType);
-static bool     psDBIsPTypeNaN(psElemType pType, psPtr data);
+static psPtr      psDBGetPTypeNaN(psElemType pType);
+static MYSQL_BOOL psDBIsPTypeNaN(psElemType pType, psPtr data);
 
 // public functions
@@ -1452 +1458 @@
     // XXX EAM 2022.03.15 : at least in mysql 8.0.28, my_bool is gone and just bool is used
     // in 5.0 and 5.6, my_bool is char
-    static bool isNull = true;       // used in a MYSQL_BIND to indicate NULL
+    static MYSQL_BOOL isNull = true;       // used in a MYSQL_BIND to indicate NULL
 
     MYSQL_BIND *bind = mysqlRow->bind;
@@ -2876 +2882 @@
 #define PS_IS_NAN(type, data, nan) *(type *)data == nan
 
-static bool psDBIsPTypeNaN(psElemType pType,
-                           psPtr data)
+static MYSQL_BOOL psDBIsPTypeNaN(psElemType pType, psPtr data)
+
 {
     bool    isNaN = NULL;