d9aa8a78daa3e4e90342542fde909fe115e7721b
galt
  Mon Aug 10 12:44:54 2015 -0700
oops compile-time mysql version checking

diff --git src/hg/lib/jksql.c src/hg/lib/jksql.c
index 5008427..62b6741 100644
--- src/hg/lib/jksql.c
+++ src/hg/lib/jksql.c
@@ -506,37 +506,36 @@
     dyStringPrintf(dy, "database=%s\n", sp->db);
 if (sp->port)
     dyStringPrintf(dy, "port=%d\n", sp->port);
 if (sp->socket)
     dyStringPrintf(dy, "socket=%s\n", sp->socket);
 if (sp->key)
     dyStringPrintf(dy, "ssl-key=%s\n", sp->key);
 if (sp->cert)
     dyStringPrintf(dy, "ssl-cert=%s\n", sp->cert);
 if (sp->ca)
     dyStringPrintf(dy, "ssl-ca=%s\n", sp->ca);
 if (sp->caPath)
     dyStringPrintf(dy, "ssl-capath=%s\n", sp->caPath);
 if (sp->cipher)
     dyStringPrintf(dy, "ssl-cipher=%s\n", sp->cipher);
-if (mysql_get_client_version() >= 50603) // mysql version "5.6.3"
-    {
+#if (MYSQL_VERSION_ID >= 50603) // mysql version "5.6.3"
     if (sp->crl)
 	dyStringPrintf(dy, "ssl-crl=%s\n", sp->crl);
     if (sp->crlPath)
 	dyStringPrintf(dy, "ssl-crlpath=%s\n", sp->crlPath);
-    }
+#endif
 if (sp->verifyServerCert && !sameString(sp->verifyServerCert,"0"))
     dyStringPrintf(dy, "ssl-verify-server-cert\n");
 return dyStringCannibalize(&dy);
 }
 
 
 static void monitorInit(void)
 /* initialize monitoring on the first call */
 {
 unsigned flags = 0;
 char *val;
 
 /* there is special code in cheap.cgi to pass these from cgiOption to env */
 
 val = getenv("JKSQL_TRACE");
@@ -1090,40 +1089,39 @@
 
 if ((sc->conn = conn = mysql_init(NULL)) == NULL)
     // no need for monitorLeave here
     errAbort("Couldn't connect to mySQL.");
 // Fix problem where client LOCAL setting is disabled by default for security
 mysql_options(conn, MYSQL_OPT_LOCAL_INFILE, NULL);
 
 // Boolean option to tell client to verify that the host server certificate Subject CN equals the hostname.
 // If turned on this can defeat Man-In-The-Middle attacks.
 if (sp->verifyServerCert && !sameString(sp->verifyServerCert,"0"))
     {
     my_bool flag = TRUE;
     mysql_options(conn, MYSQL_OPT_SSL_VERIFY_SERVER_CERT, &flag);
     }
 
-if (mysql_get_client_version() >= 50603) // mysql version "5.6.3"
-    {
+#if (MYSQL_VERSION_ID >= 50603) // mysql version "5.6.3"
     // If certificate revocation list file provided, set mysql option
     if (sp->crl)
 	mysql_options(conn, MYSQL_OPT_SSL_CRL, &sp->crl);
 
     // If path to directory with crl files provided, set mysql option
     if (sp->crlPath)
 	mysql_options(conn, MYSQL_OPT_SSL_CRLPATH, &sp->crlPath);
-    }
+#endif
 
 if (sp->key || sp->cert || sp->ca || sp->caPath || sp->cipher)
     mysql_ssl_set(conn, sp->key, sp->cert, sp->ca, sp->caPath, sp->cipher); 
 
 if (mysql_real_connect(
 	conn,
 	sp->host, /* host */
 	sp->user,	/* user name */
 	sp->password,	/* password */
 	database, /* database */
 	sp->port,	/* port */
 	sp->socket,	/* socket */
 	0)	/* flags */  == NULL)
     {
     monitorLeave();