Index: branches/eam_branches/ipp-20230313/psLib/src/db/psDB.c
===================================================================
--- branches/eam_branches/ipp-20230313/psLib/src/db/psDB.c	(revision 42761)
+++ branches/eam_branches/ipp-20230313/psLib/src/db/psDB.c	(revision 42820)
@@ -1039,8 +1039,14 @@
     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))) {
Index: branches/eam_branches/ipp-20230313/psLib/src/sys/psConfigure.c
===================================================================
--- branches/eam_branches/ipp-20230313/psLib/src/sys/psConfigure.c	(revision 42761)
+++ branches/eam_branches/ipp-20230313/psLib/src/sys/psConfigure.c	(revision 42820)
@@ -29,4 +29,5 @@
 #include <fftw3.h>
 #include <gsl/gsl_version.h>
+#include <gsl/gsl_errno.h>
 #ifdef HAVE_PSDB
 #include <mysql.h>
@@ -157,4 +158,6 @@
     // XXX: Still needs error codes to be set
 
+  gsl_set_error_handler_off();
+
     if (timeConfig && strlen(timeConfig) > 0) {
         if (!psTimeInit(timeConfig)) {