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

Timestamp:

May 8, 2025, 4:10:23 PM (15 months ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20230313

Files:

• . (modified) (1 prop)
• psLib (modified) (1 prop)
• psLib/src/db/psDB.c (modified) (1 diff)

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

@@ -1039 +1039 @@
     fieldCount = mysql_num_fields(result);
 
+<<<<<<< .working
     // annoyingly, in some versions of mysql the value my_ulonglong is actually unsigned long long and in others
     // it is actually unsigned long.  rather than try to set a print type which depends on the build, we just
     // cast here to the unsigned long since it is rare that we would need such a large rowCount
     psTrace("psLib.db", PS_LOG_INFO, "query returned %lu rows with %d fields", (unsigned long) rowCount, fieldCount);
+||||||| .merge-left.r42748
+    psTrace("psLib.db", PS_LOG_INFO, "query returned %lld rows with %d fields",             rowCount, fieldCount);
+=======
+    psTrace("psLib.db", PS_LOG_INFO, "query returned %lu rows with %d fields", (long unsigned int) rowCount, fieldCount);
+>>>>>>> .merge-right.r42814
 
     while ((row = mysql_fetch_row(result))) {