9061d3e02c215bb77e57e42e5cd22f8fd86da047 angie Tue Jul 20 14:02:11 2021 -0700 New debugging fprintf from b79f8a6f8 was breaking various 'make test' diffs; show the message only when JKSQL_TRACE is set. diff --git src/hg/lib/jksql.c src/hg/lib/jksql.c index ec6661a..7aa7153 100644 --- src/hg/lib/jksql.c +++ src/hg/lib/jksql.c @@ -1243,30 +1243,31 @@ * not connected yet, as indicated by a NULL mysql connection pointer */ { static struct sqlConnection *sc; AllocVar(sc); sc->conn = NULL; sc->profile = profile; // remember the profile, needed to connect later sc->db = cloneString(database); sc->hasTableCache = -1; // -1 => undefined return sc; } static struct sqlConnection *sqlConnProfile(struct sqlProfile* sp, char *database, boolean abort) /* Connect to database using the profile. Database maybe NULL to connect to * the server. Optionally abort on failure. */ { +if (monitorFlags & JKSQL_TRACE) fprintf(stderr, "SQL_CONNECT_PROFILE %s %s %s\n", sp->name, sp->host, database); bool mainAbort = abort; struct sqlConnection *sc; // get the failover profile for the profile, if it exists struct sqlProfile *failoverProf = sqlProfileGetFailover(sp, database); // if we have a failover profile, don't abort right away if (failoverProf!=NULL) mainAbort = FALSE; // connect with the default profile sc = sqlConnRemote(sp, database, mainAbort); if (failoverProf==NULL) // the default case, without a failover connection: just return sc, can be NULL return sc;